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

ppapi/proxy/ppb_surface_3d_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_surface_3d_proxy.h"
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/dev/ppb_surface_3d_dev.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/proxy/ppb_context_3d_proxy.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::thunk::EnterFunctionNoLock;
 using ppapi::thunk::PPB_Surface3D_API;
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
 InterfaceProxy* CreateSurface3DProxy(Dispatcher* dispatcher,
                                      const void* target_interface) {
   return new PPB_Surface3D_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
 // Surface3D -------------------------------------------------------------------
 
 Surface3D::Surface3D(const HostResource& host_resource)
-    : PluginResource(host_resource),
-      resource_(0),
+    : Resource(host_resource),
       context_(NULL),
       current_flush_callback_(PP_BlockUntilComplete()) {
 }
 
 Surface3D::~Surface3D() {
   if (context_)
     context_->BindSurfaces(0, 0);
 }
 
 PPB_Surface3D_API* Surface3D::AsPPB_Surface3D_API() {
@@ skipping 20 matching lines @@
     return PP_ERROR_INPROGRESS;  // Can't have >1 flush pending.
 
   if (!context_)
     return PP_ERROR_FAILED;
 
   current_flush_callback_ = callback;
 
   IPC::Message* msg = new PpapiHostMsg_PPBSurface3D_SwapBuffers(
       INTERFACE_ID_PPB_SURFACE_3D, host_resource());
   msg->set_unblock(true);
-  GetDispatcher()->Send(msg);
+  PluginDispatcher::GetForResource(this)->Send(msg);
 
   context_->gles2_impl()->SwapBuffers();
   return PP_OK_COMPLETIONPENDING;
 }
 
 void Surface3D::SwapBuffersACK(int32_t pp_error) {
   PP_RunAndClearCompletionCallback(&current_flush_callback_, pp_error);
 }
 
 // PPB_Surface3D_Proxy ---------------------------------------------------------
@@ skipping 37 matching lines @@
     }
   }
   attribs.push_back(PP_GRAPHICS3DATTRIB_NONE);  // Always terminate.
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBSurface3D_Create(
       INTERFACE_ID_PPB_SURFACE_3D, instance, config, attribs, &result));
 
   if (result.is_null())
     return 0;
-  scoped_refptr<Surface3D> surface_3d(new Surface3D(result));
-  PP_Resource resource =
-      PluginResourceTracker::GetInstance()->AddResource(surface_3d);
-  surface_3d->set_resource(resource);
-  return resource;
+  return (new Surface3D(result))->GetReference();
 }
 
 bool PPB_Surface3D_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Surface3D_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBSurface3D_Create,
                         OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBSurface3D_SwapBuffers,
                         OnMsgSwapBuffers)
 
@@ skipping 39 matching lines @@
 
 void PPB_Surface3D_Proxy::SendSwapBuffersACKToPlugin(
     int32_t result,
     const HostResource& surface_3d) {
   dispatcher()->Send(new PpapiMsg_PPBSurface3D_SwapBuffersACK(
       INTERFACE_ID_PPB_SURFACE_3D, surface_3d, result));
 }
 
 }  // namespace proxy
 }  // namespace pp