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

Re-add dirtyOnly to FrameSubscriber and document API change

Browse source
This commit is contained in:
Heilig Benedek 2018-05-14 19:09:05 +02:00 • committed by Samuel Attard
parent b9413fe59d
commit 60ba2013c4
4 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1637,15 +1637,17 @@ void WebContents::SendInputEvent(v8::Isolate* isolate,
}
void WebContents::BeginFrameSubscription(mate::Arguments* args) {
bool only_dirty = false;
FrameSubscriber::FrameCaptureCallback callback;
args->GetNext(&only_dirty);
if (!args->GetNext(&callback)) {
args->ThrowError();
return;
}
frame_subscriber_.reset(
new FrameSubscriber(isolate(), web_contents(), callback));
new FrameSubscriber(isolate(), web_contents(), callback, only_dirty));
}
void WebContents::EndFrameSubscription() {

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

@ -11,6 +11,7 @@
#include "content/browser/compositor/surface_utils.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/skbitmap_operations.h"
namespace atom {
@ -18,10 +19,12 @@ namespace api {
FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
content::WebContents* web_contents,
const FrameCaptureCallback& callback)
const FrameCaptureCallback& callback,
bool only_dirty)
: content::WebContentsObserver(web_contents),
isolate_(isolate),
callback_(callback) {}
callback_(callback),
only_dirty_(only_dirty) {}
FrameSubscriber::~FrameSubscriber() = default;
@ -70,7 +73,14 @@ void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) {
const_cast<SkBitmap&>(frame).setAlphaType(kPremul_SkAlphaType);
v8::Local<v8::Value> damage_rect =
mate::Converter<gfx::Rect>::ToV8(isolate_, damage);
callback_.Run(gfx::Image::CreateFrom1xBitmap(frame), damage_rect);
if (only_dirty_) {
const SkBitmap& damageFrame = SkBitmapOperations::CreateTiledBitmap(
frame, damage.x(), damage.y(), damage.width(), damage.height());
callback_.Run(gfx::Image::CreateFrom1xBitmap(damageFrame), damage_rect);
} else {
callback_.Run(gfx::Image::CreateFrom1xBitmap(frame), damage_rect);
}
}
} // namespace api

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

@ -26,7 +26,8 @@ class FrameSubscriber : public content::WebContentsObserver {
FrameSubscriber(v8::Isolate* isolate,
content::WebContents* web_contents,
const FrameCaptureCallback& callback);
const FrameCaptureCallback& callback,
bool only_dirty);
~FrameSubscriber();
private:
@ -36,6 +37,7 @@ class FrameSubscriber : public content::WebContentsObserver {
v8::Isolate* isolate_;
FrameCaptureCallback callback_;
bool only_dirty_;
DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);
};