From faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4 Mon Sep 17 00:00:00 2001 From: "sail@chromium.org" Date: Tue, 18 Oct 2011 22:16:26 +0000 Subject: Revert 106142 - Add a new globals object for PPAPI tracking information. This adds a specialization on the host and plugin side of the proxy. This replaces the ad-hoc singleton tracking done by the resource and var trackers with just being getters on this global object. Most code can use the single PpapiGlobals class. I also allow code to get the host and plugin specializations since some code needs access to some specific features of each side. In a later pass I'll move the other stuff out of TrackerBase and delete it. TEST=none BUG=none Review URL: http://codereview.chromium.org/8316008 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/8342016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106148 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/proxy/ppb_graphics_2d_proxy.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ppapi/proxy/ppb_graphics_2d_proxy.cc') diff --git a/ppapi/proxy/ppb_graphics_2d_proxy.cc b/ppapi/proxy/ppb_graphics_2d_proxy.cc index 7bed679..dcf8d26 100644 --- a/ppapi/proxy/ppb_graphics_2d_proxy.cc +++ b/ppapi/proxy/ppb_graphics_2d_proxy.cc @@ -87,8 +87,8 @@ PP_Bool Graphics2D::Describe(PP_Size* size, PP_Bool* is_always_opaque) { void Graphics2D::PaintImageData(PP_Resource image_data, const PP_Point* top_left, const PP_Rect* src_rect) { - Resource* image_object = - PpapiGlobals::Get()->GetResourceTracker()->GetResource(image_data); + Resource* image_object = PluginResourceTracker::GetInstance()-> + GetResource(image_data); if (!image_object || pp_instance() != image_object->pp_instance()) return; @@ -110,8 +110,8 @@ void Graphics2D::Scroll(const PP_Rect* clip_rect, } void Graphics2D::ReplaceContents(PP_Resource image_data) { - Resource* image_object = - PpapiGlobals::Get()->GetResourceTracker()->GetResource(image_data); + Resource* image_object = PluginResourceTracker::GetInstance()-> + GetResource(image_data); if (!image_object || pp_instance() != image_object->pp_instance()) return; -- cgit v1.1