mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Cleanup code of beginFrameSubscription

Browse source
This commit is contained in:
Cheng Zhao 2016-06-26 11:46:40 +09:00
parent 3d2ad0080d
commit e1ad64013e
4 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/api/atom_api_web_contents.cc
View file

@ -1181,15 +1181,14 @@ void WebContents::SendInputEvent(v8::Isolate* isolate,
isolate, "Invalid event object"))); isolate, "Invalid event object")));
} }
void WebContents::BeginFrameSubscription( void WebContents::BeginFrameSubscription(mate::Arguments* args) {
mate::Arguments* args) {
FrameSubscriber::FrameCaptureCallback callback;
bool only_dirty = false; bool only_dirty = false;
FrameSubscriber::FrameCaptureCallback callback;
if (!args->GetNext(&callback)) {
args->GetNext(&only_dirty); args->GetNext(&only_dirty);
if (!args->GetNext(&callback)) if (!args->GetNext(&callback)) {
args->ThrowTypeError("'callback' must be defined"); args->ThrowError();
return;
} }
const auto view = web_contents()->GetRenderWidgetHostView(); const auto view = web_contents()->GetRenderWidgetHostView();

12
atom/browser/api/frame_subscriber.cc
View file

@ -5,8 +5,8 @@
#include "atom/browser/api/frame_subscriber.h" #include "atom/browser/api/frame_subscriber.h"
#include "base/bind.h" #include "base/bind.h"
#include "atom/common/node_includes.h"
#include "atom/common/native_mate_converters/gfx_converter.h" #include "atom/common/native_mate_converters/gfx_converter.h"
#include "atom/common/node_includes.h"
#include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host.h"
namespace atom { namespace atom {
@ -17,8 +17,11 @@ FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
content::RenderWidgetHostView* view, content::RenderWidgetHostView* view,
const FrameCaptureCallback& callback, const FrameCaptureCallback& callback,
bool only_dirty) bool only_dirty)
: isolate_(isolate), view_(view), callback_(callback), : isolate_(isolate),
only_dirty_(only_dirty), weak_factory_(this) { view_(view),
callback_(callback),
only_dirty_(only_dirty),
weak_factory_(this) {
} }
bool FrameSubscriber::ShouldCaptureFrame( bool FrameSubscriber::ShouldCaptureFrame(
@ -48,7 +51,8 @@ bool FrameSubscriber::ShouldCaptureFrame(
} }
void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback, void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback,
const gfx::Rect& damage_rect, const SkBitmap& bitmap, const gfx::Rect& damage_rect,
const SkBitmap& bitmap,
content::ReadbackResponse response) { content::ReadbackResponse response) {
if (response != content::ReadbackResponse::READBACK_SUCCESS) if (response != content::ReadbackResponse::READBACK_SUCCESS)
return; return;

3
atom/browser/api/frame_subscriber.h
View file

@ -35,7 +35,8 @@ class FrameSubscriber : public content::RenderWidgetHostViewFrameSubscriber {
private: private:
void OnFrameDelivered(const FrameCaptureCallback& callback, void OnFrameDelivered(const FrameCaptureCallback& callback,
const gfx::Rect& damage_rect, const SkBitmap& bitmap, const gfx::Rect& damage_rect,
const SkBitmap& bitmap,
content::ReadbackResponse response); content::ReadbackResponse response);
v8::Isolate* isolate_; v8::Isolate* isolate_;

2
docs/api/web-contents.md
View file

@ -921,7 +921,7 @@ For the `mouseWheel` event, the `event` object also have following properties:
### `webContents.beginFrameSubscription([onlyDirty ,]callback)` ### `webContents.beginFrameSubscription([onlyDirty ,]callback)`
* `onlyDirty` Boolean * `onlyDirty` Boolean (optional) - Defaults to `false`
* `callback` Function * `callback` Function
Begin subscribing for presentation events and captured frames, the `callback` Begin subscribing for presentation events and captured frames, the `callback`