content/browser/renderer_host/render_widget_host_view_mac.mm - Issue 11031055: Introduce PlatformBitmap, which is a minimal helper class that wraps an SkBitmap

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 11031055: Introduce PlatformBitmap, which is a minimal helper class that wraps an SkBitmap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.h ('k') | content/browser/renderer_host/render_widget_host_view_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac.mm

===================================================================

--- content/browser/renderer_host/render_widget_host_view_mac.mm (revision 161107)

+++ content/browser/renderer_host/render_widget_host_view_mac.mm (working copy)

@@ -834,7 +834,7 @@

const gfx::Rect& src_subrect,

const gfx::Size& dst_size,

const base::Callback<void(bool)>& callback,

- skia::PlatformCanvas* output) {

+ skia::PlatformBitmap* output) {

base::ScopedClosureRunner scoped_callback_runner(base::Bind(callback, false));

if (!compositing_iosurface_.get() ||

!compositing_iosurface_->HasIOSurface())

@@ -842,7 +842,7 @@

float scale = ScaleFactor(cocoa_view_);

gfx::Size dst_pixel_size = gfx::ToFlooredSize(dst_size.Scale(scale));

- if (!output->initialize(

+ if (!output->Allocate(

dst_pixel_size.width(), dst_pixel_size.height(), true))

return;

scoped_callback_runner.Release();

@@ -857,7 +857,7 @@

compositing_iosurface_->CopyTo(

src_pixel_gl_subrect,

dst_pixel_size,

- output->getTopDevice()->accessBitmap(true).getPixels(),

+ output->GetBitmap().getPixels(),

callback);

}