| Index: ppapi/proxy/ppb_flash_proxy.cc
|
| ===================================================================
|
| --- ppapi/proxy/ppb_flash_proxy.cc (revision 106146)
|
| +++ ppapi/proxy/ppb_flash_proxy.cc (working copy)
|
| @@ -14,12 +14,11 @@
|
| #include "ppapi/c/private/ppb_flash.h"
|
| #include "ppapi/proxy/host_dispatcher.h"
|
| #include "ppapi/proxy/plugin_dispatcher.h"
|
| +#include "ppapi/proxy/plugin_resource_tracker.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| #include "ppapi/proxy/proxy_module.h"
|
| #include "ppapi/proxy/serialized_var.h"
|
| -#include "ppapi/shared_impl/ppapi_globals.h"
|
| #include "ppapi/shared_impl/resource.h"
|
| -#include "ppapi/shared_impl/resource_tracker.h"
|
| #include "ppapi/shared_impl/scoped_pp_resource.h"
|
| #include "ppapi/shared_impl/var.h"
|
| #include "ppapi/thunk/enter.h"
|
| @@ -49,8 +48,8 @@
|
| uint32_t glyph_count,
|
| const uint16_t glyph_indices[],
|
| const PP_Point glyph_advances[]) {
|
| - Resource* image_data =
|
| - PpapiGlobals::Get()->GetResourceTracker()->GetResource(pp_image_data);
|
| + Resource* image_data = PluginResourceTracker::GetInstance()->GetResource(
|
| + pp_image_data);
|
| if (!image_data)
|
| return PP_FALSE;
|
| // The instance parameter isn't strictly necessary but we check that it
|
|
|