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

ppapi/proxy/ppb_graphics_2d_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_graphics_2d_proxy.h"
 
 #include <string.h>  // For memset.
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_graphics_2d_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::thunk::PPB_Graphics2D_API;
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
 InterfaceProxy* CreateGraphics2DProxy(Dispatcher* dispatcher,
                                       const void* target_interface) {
   return new PPB_Graphics2D_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
-class Graphics2D : public PluginResource,
-                   public ::ppapi::thunk::PPB_Graphics2D_API {
+class Graphics2D : public ppapi::Resource,
+                   public ppapi::thunk::PPB_Graphics2D_API {
  public:
   Graphics2D(const HostResource& host_resource,
              const PP_Size& size,
              PP_Bool is_always_opaque);
   virtual ~Graphics2D();
 
-  // ResourceObjectBase.
+  // Resource.
   virtual PPB_Graphics2D_API* AsPPB_Graphics2D_API();
 
   // PPB_Graphics_2D_API.
   PP_Bool Describe(PP_Size* size, PP_Bool* is_always_opaque);
   void PaintImageData(PP_Resource image_data,
                       const PP_Point* top_left,
                       const PP_Rect* src_rect);
   void Scroll(const PP_Rect* clip_rect,
               const PP_Point* amount);
   void ReplaceContents(PP_Resource image_data);
   int32_t Flush(PP_CompletionCallback callback);
 
   // Notification that the host has sent an ACK for a pending Flush.
   void FlushACK(int32_t result_code);
 
  private:
+  PluginDispatcher* GetDispatcher() const {
+    return PluginDispatcher::GetForResource(this);
+  }
+
   PP_Size size_;
   PP_Bool is_always_opaque_;
 
   // In the plugin, this is the current callback set for Flushes. When the
   // callback function pointer is non-NULL, we're waiting for a flush ACK.
   PP_CompletionCallback current_flush_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(Graphics2D);
 };
 
 Graphics2D::Graphics2D(const HostResource& host_resource,
                        const PP_Size& size,
                        PP_Bool is_always_opaque)
-    : PluginResource(host_resource),
+    : Resource(host_resource),
       size_(size),
       is_always_opaque_(is_always_opaque),
       current_flush_callback_(PP_BlockUntilComplete()) {
 }
 
 Graphics2D::~Graphics2D() {
 }
 
 PPB_Graphics2D_API* Graphics2D::AsPPB_Graphics2D_API() {
   return this;
 }
 
 PP_Bool Graphics2D::Describe(PP_Size* size, PP_Bool* is_always_opaque) {
   *size = size_;
   *is_always_opaque = is_always_opaque_;
   return PP_TRUE;
 }
 
 void Graphics2D::PaintImageData(PP_Resource image_data,
                                 const PP_Point* top_left,
                                 const PP_Rect* src_rect) {
-  PluginResource* image_object = PluginResourceTracker::GetInstance()->
-      GetResourceObject(image_data);
-  //if (!image_object || instance() != image_object->instance())
+  Resource* image_object = PluginResourceTracker::GetInstance()->
+      GetResource(image_data);
+  //if (!image_object || pp_instance() != image_object->pp_instance())
   //  return;

[dmichael (off chromium), 2011/08/17 16:28:07]

Since you're in the neighborhood, can you just delete this dead code? Or
uncomment...  they seem like good checks.

 
   PP_Rect dummy;
   memset(&dummy, 0, sizeof(PP_Rect));
   GetDispatcher()->Send(new PpapiHostMsg_PPBGraphics2D_PaintImageData(
       INTERFACE_ID_PPB_GRAPHICS_2D, host_resource(),
       image_object->host_resource(), *top_left, !!src_rect,
       src_rect ? *src_rect : dummy));
 }
 
 void Graphics2D::Scroll(const PP_Rect* clip_rect,
                         const PP_Point* amount) {
   PP_Rect dummy;
   memset(&dummy, 0, sizeof(PP_Rect));
   GetDispatcher()->Send(new PpapiHostMsg_PPBGraphics2D_Scroll(
       INTERFACE_ID_PPB_GRAPHICS_2D, host_resource(),
       !!clip_rect, clip_rect ? *clip_rect : dummy, *amount));
 }
 
 void Graphics2D::ReplaceContents(PP_Resource image_data) {
-  PluginResource* image_object = PluginResourceTracker::GetInstance()->
-      GetResourceObject(image_data);
-  if (!image_object || instance() != image_object->instance())
+  Resource* image_object = PluginResourceTracker::GetInstance()->
+      GetResource(image_data);
+  if (!image_object || pp_instance() != image_object->pp_instance())
     return;
 
   GetDispatcher()->Send(new PpapiHostMsg_PPBGraphics2D_ReplaceContents(
       INTERFACE_ID_PPB_GRAPHICS_2D, host_resource(),
       image_object->host_resource()));
 }
 
 int32_t Graphics2D::Flush(PP_CompletionCallback callback) {
   // For now, disallow blocking calls. We'll need to add support for other
   // threads to this later.
@@ skipping 42 matching lines @@
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_ResourceCreation_Graphics2D(
       INTERFACE_ID_RESOURCE_CREATION, instance, size, is_always_opaque,
       &result));
   if (result.is_null())
     return 0;
-  return PluginResourceTracker::GetInstance()->AddResource(
-      new Graphics2D(result, size, is_always_opaque));
+  return (new Graphics2D(result, size, is_always_opaque))->GetReference();
 }
 
 bool PPB_Graphics2D_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Graphics2D_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics2D_PaintImageData,
                         OnMsgPaintImageData)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics2D_Scroll,
                         OnMsgScroll)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics2D_ReplaceContents,
@@ skipping 59 matching lines @@
 
 void PPB_Graphics2D_Proxy::SendFlushACKToPlugin(
     int32_t result,
     const HostResource& graphics_2d) {
   dispatcher()->Send(new PpapiMsg_PPBGraphics2D_FlushACK(
       INTERFACE_ID_PPB_GRAPHICS_2D, graphics_2d, result));
 }
 
 }  // namespace proxy
 }  // namespace pp