webkit/plugins/ppapi/ppb_image_data_impl.cc - Issue 6987019: Revert 86625 - This change implements a first pass in the effort to remove the dependency of Plat...

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: webkit/plugins/ppapi/ppb_image_data_impl.cc

Issue 6987019: Revert 86625 - This change implements a first pass in the effort to remove the dependency of Plat... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 7 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

Index: webkit/plugins/ppapi/ppb_image_data_impl.cc

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

--- webkit/plugins/ppapi/ppb_image_data_impl.cc (revision 86628)

+++ webkit/plugins/ppapi/ppb_image_data_impl.cc (working copy)

@@ -106,7 +106,7 @@

return NULL;

}

const SkBitmap& bitmap =

- skia::GetTopDevice(*mapped_canvas_)->accessBitmap(true);

+ mapped_canvas_->getTopPlatformDevice().accessBitmap(true);

// Our platform bitmaps are set to opaque by default, which we don't want.

const_cast<SkBitmap&>(bitmap).setIsOpaque(false);

@@ -129,7 +129,7 @@

const SkBitmap* PPB_ImageData_Impl::GetMappedBitmap() const {

if (!mapped_canvas_.get())

return NULL;

- return &skia::GetTopDevice(*mapped_canvas_)->accessBitmap(false);

+ return &mapped_canvas_->getTopPlatformDevice().accessBitmap(false);

}

void PPB_ImageData_Impl::Swap(PPB_ImageData_Impl* other) {

« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.cc ('k') | webkit/plugins/ppapi/ppb_pdf_impl.cc » ('j') | no next file with comments »