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

ppapi/proxy/ppb_font_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_font_proxy.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_image_data_proxy.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
-#include "ppapi/shared_impl/resource_object_base.h"
+#include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_ImageData_API;
 using ppapi::WebKitForwarding;
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
@@ skipping 56 matching lines @@
 }
 
 bool PPB_Font_Proxy::OnMessageReceived(const IPC::Message& msg) {
   // There aren't any font messages.
   NOTREACHED();
   return false;
 }
 
 Font::Font(const HostResource& resource,
            const PP_FontDescription_Dev& desc)
-    : PluginResource(resource),
+    : Resource(resource),
       webkit_event_(false, false) {
   TRACE_EVENT0("ppapi proxy", "Font::Font");
   scoped_refptr<StringVar> face(StringVar::FromPPVar(desc.face));
 
-  WebKitForwarding* forwarding = GetDispatcher()->GetWebKitForwarding();
+  PluginDispatcher* dispatcher = PluginDispatcher::GetForResource(this);
+  WebKitForwarding* forwarding = dispatcher->GetWebKitForwarding();
 
   RunOnWebKitThread(true,
                     base::Bind(&WebKitForwarding::CreateFontForwarding,
                                base::Unretained(forwarding),
                                &webkit_event_, desc,
                                face.get() ? face->value() : std::string(),
-                               GetDispatcher()->preferences(),
+                               dispatcher->preferences(),
                                &font_forwarding_));
 }
 
 Font::~Font() {
   RunOnWebKitThread(false, base::Bind(&DeleteFontForwarding, font_forwarding_));
 }
 
 ppapi::thunk::PPB_Font_API* Font::AsPPB_Font_API() {
   return this;
 }
@@ skipping 93 matching lines @@
     return -1;
   int32_t result = -1;
   RunOnWebKitThread(true,
                     base::Bind(&WebKitForwarding::Font::PixelOffsetForCharacter,
                                base::Unretained(font_forwarding_),
                                &webkit_event_, run, char_offset, &result));
   return result;
 }
 
 void Font::RunOnWebKitThread(bool blocking, const base::Closure& task) {
-  GetDispatcher()->PostToWebKitThread(FROM_HERE, task);
+  PluginDispatcher::GetForResource(this)->PostToWebKitThread(FROM_HERE, task);
   if (blocking)
     webkit_event_.Wait();
 }
 
 // static
 void Font::DeleteFontForwarding(
     ppapi::WebKitForwarding::Font* font_forwarding) {
   delete font_forwarding;
 }
 
 }  // namespace proxy
 }  // namespace pp