Skip to content

Commit

Permalink
removed bpp (it can be calculated)
Browse files Browse the repository at this point in the history
fixed buffer size calculation (we actually send the whole image, not just the dirty part)
removed the unnecessary resets and const
now we use Copy instead of New
  • Loading branch information
brenca committed Aug 4, 2016
1 parent ca16132 commit 1b0af6f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
9 changes: 4 additions & 5 deletions atom/browser/api/atom_api_web_contents.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1345,16 +1345,15 @@ bool WebContents::IsOffScreen() const {

void WebContents::OnPaint(const gfx::Rect& dirty_rect,
const gfx::Size& bitmap_size,
const int pixel_size,
int pixel_size,
void* bitmap_pixels) {
v8::MaybeLocal<v8::Object> buffer = node::Buffer::New(
v8::MaybeLocal<v8::Object> buffer = node::Buffer::Copy(
isolate(), reinterpret_cast<char*>(bitmap_pixels),
pixel_size * dirty_rect.width() * dirty_rect.height());
pixel_size * bitmap_size.width() * bitmap_size.height());

mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate());
dict.Set("width", bitmap_size.width());
dict.Set("height", bitmap_size.height());
dict.Set("bytesPerPixel", pixel_size);

if (!buffer.IsEmpty())
Emit("paint", dirty_rect, buffer.ToLocalChecked(), dict);
Expand All @@ -1367,8 +1366,8 @@ void WebContents::StartPainting() {
auto* osr_rwhv = static_cast<OffScreenRenderWidgetHostView*>(
web_contents()->GetRenderWidgetHostView());
if (osr_rwhv) {
osr_rwhv->SetPainting(true);
osr_rwhv->Show();
osr_rwhv->SetPainting(true);
}
}

Expand Down
7 changes: 0 additions & 7 deletions atom/browser/osr/osr_render_widget_host_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -379,13 +379,6 @@ OffScreenRenderWidgetHostView::~OffScreenRenderWidgetHostView() {
#if defined(OS_MACOSX)
DestroyPlatformWidget();
#endif

if (copy_frame_generator_.get())
copy_frame_generator_.reset(nullptr);

delegated_frame_host_.reset(nullptr);
compositor_.reset(nullptr);
root_layer_.reset(nullptr);
}

void OffScreenRenderWidgetHostView::OnBeginFrameTimerTick() {
Expand Down

0 comments on commit 1b0af6f

Please sign in to comment.