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

Frame subscriber bugfix + added only_damaged option

Browse source
This commit is contained in:
Heilig Benedek 2016-06-21 02:15:39 +02:00
parent a35915ee9f
commit 3529f8a40a
4 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@
#include "base/bind.h"
#include "atom/common/node_includes.h"
#include "atom/common/native_mate_converters/gfx_converter.h"
#include "content/public/browser/render_widget_host.h"
namespace atom {
@ -14,8 +15,10 @@ namespace api {
FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
content::RenderWidgetHostView* view,
const FrameCaptureCallback& callback)
: isolate_(isolate), view_(view), callback_(callback), weak_factory_(this) {
const FrameCaptureCallback& callback,
const bool& only_damaged)
: isolate_(isolate), view_(view), only_damaged_(only_damaged),
callback_(callback), weak_factory_(this) {
}
bool FrameSubscriber::ShouldCaptureFrame(
@ -27,21 +30,27 @@ bool FrameSubscriber::ShouldCaptureFrame(
if (!view_ || !host)
return false;
const auto size = view_->GetVisibleViewportSize();
if (damage_rect.width() == 0 || damage_rect.height() == 0)
return false;
gfx::Rect rect = gfx::Rect(view_->GetVisibleViewportSize());
if (only_damaged_)
rect = damage_rect;
host->CopyFromBackingStore(
gfx::Rect(size),
size,
rect,
rect.size(),
base::Bind(&FrameSubscriber::OnFrameDelivered,
weak_factory_.GetWeakPtr(), callback_),
weak_factory_.GetWeakPtr(), callback_, rect),
kBGRA_8888_SkColorType);
return false;
}
void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback,
const SkBitmap& bitmap, content::ReadbackResponse response) {
if (bitmap.computeSize64() == 0)
const gfx::Rect& damage_rect, const SkBitmap& bitmap,
content::ReadbackResponse response) {
if (response != content::ReadbackResponse::READBACK_SUCCESS)
return;
v8::Locker locker(isolate_);
@ -57,7 +66,10 @@ void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback,
reinterpret_cast<uint8_t*>(node::Buffer::Data(buffer.ToLocalChecked())),
rgb_arr_size);
callback_.Run(buffer.ToLocalChecked());
v8::Local<v8::Value> damage =
mate::Converter<gfx::Rect>::ToV8(isolate_, damage_rect);
callback_.Run(buffer.ToLocalChecked(), damage);
}
} // namespace api