Add a unified resource tracker shared between the proxy and the impl.

ppapi/proxy/ppb_flash_proxy.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppb_flash_proxy.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource.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/resource.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
 void SetInstanceAlwaysOnTop(PP_Instance pp_instance, PP_Bool on_top) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(pp_instance);
   if (dispatcher) {
     dispatcher->Send(new PpapiHostMsg_PPBFlash_SetInstanceAlwaysOnTop(
         INTERFACE_ID_PPB_FLASH, pp_instance, on_top));
   }
 }
 
 PP_Bool DrawGlyphs(PP_Instance instance,
                    PP_Resource pp_image_data,
                    const PP_FontDescription_Dev* font_desc,
                    uint32_t color,
                    PP_Point position,
                    PP_Rect clip,
                    const float transformation[3][3],
                    uint32_t glyph_count,
                    const uint16_t glyph_indices[],
                    const PP_Point glyph_advances[]) {
-  PluginResource* image_data = PluginResourceTracker::GetInstance()->
-      GetResourceObject(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
   // matches anyway.
-  if (image_data->instance() != instance)
+  if (image_data->pp_instance() != instance)
     return PP_FALSE;
 
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
-      image_data->instance());
+      image_data->pp_instance());
   if (!dispatcher)
     return PP_FALSE;
 
   PPBFlash_DrawGlyphs_Params params;
   params.image_data = image_data->host_resource();
   params.font_desc.SetFromPPFontDescription(dispatcher, *font_desc, true);
   params.color = color;
   params.position = position;
   params.clip = clip;
   for (int i = 0; i < 3; i++) {
@@ skipping 21 matching lines @@
 
   ReceiveSerializedVarReturnValue result;
   dispatcher->Send(new PpapiHostMsg_PPBFlash_GetProxyForURL(
       INTERFACE_ID_PPB_FLASH, instance, url, &result));
   return result.Return(dispatcher);
 }
 
 int32_t Navigate(PP_Resource request_id,
                  const char* target,
                  bool from_user_action) {
-  PluginResource* request_object =
-      PluginResourceTracker::GetInstance()->GetResourceObject(request_id);
+  Resource* request_object =
+      PluginResourceTracker::GetInstance()->GetResource(request_id);
   if (!request_object)
     return PP_ERROR_BADRESOURCE;
 
   PluginDispatcher* dispatcher =
-      PluginDispatcher::GetForInstance(request_object->instance());
+      PluginDispatcher::GetForInstance(request_object->pp_instance());
   if (!dispatcher)
     return PP_ERROR_FAILED;
 
   int32_t result = PP_ERROR_FAILED;
   dispatcher->Send(new PpapiHostMsg_PPBFlash_Navigate(
       INTERFACE_ID_PPB_FLASH,
       request_object->host_resource(), target, from_user_action,
       &result));
   return result;
 }
@@ skipping 168 matching lines @@
 }
 
 void PPB_Flash_Proxy::OnMsgGetLocalTimeZoneOffset(PP_Instance instance,
                                                   PP_Time t,
                                                   double* result) {
   *result = ppb_flash_target()->GetLocalTimeZoneOffset(instance, t);
 }
 
 }  // namespace proxy
 }  // namespace pp