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

Pass SkBitmap directly

Browse source
This commit is contained in:
Cheng Zhao 2016-08-04 13:22:19 +09:00
parent 530fcc8de1
commit 64334fd40b
7 changed files with 16 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/osr/osr_render_widget_host_view.cc
View file

@ -260,9 +260,7 @@ class AtomCopyFrameGenerator {
const gfx::Rect& damage_rect,
const SkBitmap& bitmap,
std::unique_ptr<SkAutoLockPixels> bitmap_pixels_lock) {
view_->OnPaint(damage_rect,
gfx::Size(bitmap.width(), bitmap.height()),
bitmap.bytesPerPixel(), bitmap.getPixels());
view_->OnPaint(damage_rect, bitmap);
if (frame_retry_count_ > 0)
frame_retry_count_ = 0;
@ -756,7 +754,8 @@ std::unique_ptr<cc::SoftwareOutputDevice>
DCHECK(!copy_frame_generator_);
DCHECK(!software_output_device_);
software_output_device_ = new OffScreenOutputDevice(transparent_,
software_output_device_ = new OffScreenOutputDevice(
transparent_,
base::Bind(&OffScreenRenderWidgetHostView::OnPaint,
weak_ptr_factory_.GetWeakPtr()));
return base::WrapUnique(software_output_device_);
@ -786,12 +785,9 @@ void OffScreenRenderWidgetHostView::OnSetNeedsBeginFrames(bool enabled) {
}
void OffScreenRenderWidgetHostView::OnPaint(
const gfx::Rect& damage_rect,
const gfx::Size& bitmap_size,
int pixel_size,
void* bitmap_pixels) {
const gfx::Rect& damage_rect, const SkBitmap& bitmap) {
TRACE_EVENT0("electron", "OffScreenRenderWidgetHostView::OnPaint");
callback_.Run(damage_rect, bitmap_size, pixel_size, bitmap_pixels);
callback_.Run(damage_rect, bitmap);
}
void OffScreenRenderWidgetHostView::SetPainting(bool painting) {