ppapi/proxy/ppb_font_proxy.cc - Issue 7206016: Convert most remaining resources to use the API/thunk system. The significant

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: ppapi/proxy/ppb_font_proxy.cc

Issue 7206016: Convert most remaining resources to use the API/thunk system. The significant (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

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

« ppapi/proxy/ppb_context_3d_proxy.h ('K') | « ppapi/proxy/ppb_flash_menu_proxy.cc ('k') | ppapi/proxy/ppb_gles_chromium_texture_mapping_proxy.h » ('j') | ppapi/proxy/ppb_opengles2_proxy.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/proxy/ppb_font_proxy.cc

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

--- ppapi/proxy/ppb_font_proxy.cc (revision 89610)

+++ ppapi/proxy/ppb_font_proxy.cc (working copy)

@@ -16,6 +16,7 @@

#include "ppapi/thunk/ppb_image_data_api.h"

#include "ppapi/thunk/thunk.h"

+using ppapi::thunk::EnterResourceNoLock;

using ppapi::thunk::PPB_ImageData_API;

using ppapi::WebKitForwarding;

@@ -148,14 +149,10 @@

const PP_Rect* clip,

PP_Bool image_data_is_opaque) {

// Convert to an ImageData object.

- ppapi::ResourceObjectBase* image_base =

- ppapi::TrackerBase::Get()->GetResourceAPI(pp_image_data);

- if (!image_base)

+ EnterResourceNoLock<PPB_ImageData_API> enter(pp_image_data, true);

+ if (enter.failed())

return PP_FALSE;

- PPB_ImageData_API* image_api = image_base->GetAs<PPB_ImageData_API>();

- if (!image_api)

- return PP_FALSE;

- ImageData* image_data = static_cast<ImageData*>(image_api);

+ ImageData* image_data = static_cast<ImageData*>(enter.object());

skia::PlatformCanvas* canvas = image_data->mapped_canvas();

bool needs_unmapping = false;