Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Unified Diff: ppapi/proxy/ppb_testing_proxy.cc

Issue 8316008: Add a new globals object for PPAPI tracking information. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
Index: ppapi/proxy/ppb_testing_proxy.cc
diff --git a/ppapi/proxy/ppb_testing_proxy.cc b/ppapi/proxy/ppb_testing_proxy.cc
index 836e1cfbbe3b5d459babadc19c09d56d33dc33e3..470d3da04175a352ad444d23b4bee341acaca4f6 100644
--- a/ppapi/proxy/ppb_testing_proxy.cc
+++ b/ppapi/proxy/ppb_testing_proxy.cc
@@ -7,9 +7,10 @@
#include "base/message_loop.h"
#include "ppapi/c/dev/ppb_testing_dev.h"
#include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/shared_impl/ppapi_globals.h"
#include "ppapi/shared_impl/resource.h"
+#include "ppapi/shared_impl/resource_tracker.h"
namespace ppapi {
namespace proxy {
@@ -19,12 +20,12 @@ namespace {
PP_Bool ReadImageData(PP_Resource graphics_2d,
PP_Resource image,
const PP_Point* top_left) {
- Resource* image_object = PluginResourceTracker::GetInstance()->
- GetResource(image);
+ Resource* image_object =
+ PpapiGlobals::Get()->GetResourceTracker()->GetResource(image);
if (!image_object)
return PP_FALSE;
Resource* graphics_2d_object =
- PluginResourceTracker::GetInstance()->GetResource(graphics_2d);
+ PpapiGlobals::Get()->GetResourceTracker()->GetResource(graphics_2d);
if (!graphics_2d_object ||
image_object->pp_instance() != graphics_2d_object->pp_instance())
return PP_FALSE;

Powered by Google App Engine
This is Rietveld 408576698