Refactor PPAPI proxy resource handling to maintain which host they came from,...

ppapi/proxy/ppb_pdf_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_pdf_proxy.h"
 
 #include <string.h>  // For memcpy.
 
 #include <map>
 
 #include "base/linked_ptr.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ppapi/c/private/ppb_pdf.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"
 
 namespace pp {
 namespace proxy {
 
 class PrivateFontFile : public PluginResource {
  public:
-  PrivateFontFile(PP_Instance instance) : PluginResource(instance) {}
+  PrivateFontFile(PP_Instance instance, SerializedResource resource)
+      : PluginResource(instance, resource) {
+  }
   virtual ~PrivateFontFile() {}
 
   // Resource overrides.
   virtual PrivateFontFile* AsPrivateFontFile() { return this; }
 
   // Sees if we have a cache of the font table and returns a pointer to it.
   // Returns NULL if we don't have it.
   std::string* GetFontTable(uint32_t table) const;
 
   std::string* AddFontTable(uint32_t table, const std::string& contents);
@@ skipping 25 matching lines @@
     PP_Instance instance,
     const PP_FontDescription_Dev* description,
     PP_PrivateFontCharset charset) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   SerializedFontDescription desc;
   desc.SetFromPPFontDescription(dispatcher, *description, true);
 
-  PP_Resource result = 0;
+  SerializedResource result;
   dispatcher->Send(new PpapiHostMsg_PPBPDF_GetFontFileWithFallback(
       INTERFACE_ID_PPB_PDF, instance, desc, charset, &result));
-  if (!result)
+  if (result.is_null())
     return 0;
 
-  linked_ptr<PrivateFontFile> object(new PrivateFontFile(instance));
-  PluginResourceTracker::GetInstance()->AddResource(result, object);
-  return result;
+  linked_ptr<PrivateFontFile> object(new PrivateFontFile(instance, result));
+  return PluginResourceTracker::GetInstance()->AddResource(object);
 }
 
 bool GetFontTableForPrivateFontFile(PP_Resource font_file,
                                     uint32_t table,
                                     void* output,
                                     uint32_t* output_length) {
   PrivateFontFile* object = PluginResource::GetAs<PrivateFontFile>(font_file);
   if (!object)
     return false;
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
       object->instance());
   if (!dispatcher)
     return false;
 
   std::string* contents = object->GetFontTable(table);
   if (!contents) {
     std::string deserialized;
     dispatcher->Send(new PpapiHostMsg_PPBPDF_GetFontTableForPrivateFontFile(
-        INTERFACE_ID_PPB_PDF, font_file, table, &deserialized));
+        INTERFACE_ID_PPB_PDF, object->host_resource(), table, &deserialized));
     if (deserialized.empty())
       return false;
     contents = object->AddFontTable(table, deserialized);
   }
 
   *output_length = static_cast<uint32_t>(contents->size());
   if (output)
     memcpy(output, contents->c_str(), *output_length);
   return true;
 }
@@ skipping 33 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   // TODO(brettw): handle bad messages!
   return handled;
 }
 
 void PPB_PDF_Proxy::OnMsgGetFontFileWithFallback(
     PP_Instance instance,
     const SerializedFontDescription& in_desc,
     int32_t charset,
-    PP_Resource* result) {
+    SerializedResource* result) {
   PP_FontDescription_Dev desc;
   in_desc.SetToPPFontDescription(dispatcher(), &desc, false);
-  *result = ppb_pdf_target()->GetFontFileWithFallback(instance, &desc,
-      static_cast<PP_PrivateFontCharset>(charset));
+  result->set_host_resource(ppb_pdf_target()->GetFontFileWithFallback(
+      instance, &desc, static_cast<PP_PrivateFontCharset>(charset)));
 }
 
-void PPB_PDF_Proxy::OnMsgGetFontTableForPrivateFontFile(PP_Resource font_file,
-                                                        uint32_t table,
-                                                        std::string* result) {
+void PPB_PDF_Proxy::OnMsgGetFontTableForPrivateFontFile(
+    SerializedResource font_file,
+    uint32_t table,
+    std::string* result) {
   // TODO(brettw): It would be nice not to copy here. At least on Linux,
   // we can map the font file into shared memory and read it that way.
   uint32_t table_length = 0;
   if (!ppb_pdf_target()->GetFontTableForPrivateFontFile(
-          font_file, table, NULL, &table_length))
+          font_file.host_resource(), table, NULL, &table_length))
     return;
 
   result->resize(table_length);
-  ppb_pdf_target()->GetFontTableForPrivateFontFile(font_file, table,
-      const_cast<char*>(result->c_str()), &table_length);
+  ppb_pdf_target()->GetFontTableForPrivateFontFile(font_file.host_resource(),
+      table, const_cast<char*>(result->c_str()), &table_length);
 }
 
 }  // namespace proxy
 }  // namespace pp