Introduce PPB_Flash_Font.

ppapi/proxy/ppb_pdf_proxy.cc

 // Copyright (c) 2012 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/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "build/build_config.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/shared_impl/ppapi_globals.h"
+#include "ppapi/shared_impl/proxy_lock.h"
+#include "ppapi/shared_impl/var_tracker.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_pdf_api.h"
 
 using ppapi::thunk::PPB_PDFFont_API;
 using ppapi::thunk::EnterResource;
 
 namespace ppapi {
 namespace proxy {
 
 class PrivateFontFile : public Resource,
@@ skipping 32 matching lines @@
   font_tables_[table] = heap_string;
   return heap_string.get();
 }
 
 namespace {
 
 PP_Resource GetFontFileWithFallback(
     PP_Instance instance,
     const PP_FontDescription_Dev* description,
     PP_PrivateFontCharset charset) {
+  ProxyAutoLock lock;
+
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   SerializedFontDescription desc;
-  desc.SetFromPPFontDescription(dispatcher, *description, true);
+  desc.SetFromPPFontDescription(*description);
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBPDF_GetFontFileWithFallback(
       API_ID_PPB_PDF, instance, desc, charset, &result));
   if (result.is_null())
     return 0;
   return (new PrivateFontFile(result))->GetReference();
 }
 
 bool GetFontTableForPrivateFontFile(PP_Resource font_file,
@@ skipping 75 matching lines @@
   // TODO(brettw): handle bad messages!
   return handled;
 }
 
 void PPB_PDF_Proxy::OnMsgGetFontFileWithFallback(
     PP_Instance instance,
     const SerializedFontDescription& in_desc,
     int32_t charset,
     HostResource* result) {
   PP_FontDescription_Dev desc;
-  in_desc.SetToPPFontDescription(dispatcher(), &desc, false);
+  in_desc.SetToPPFontDescription(&desc);
   result->SetHostResource(instance,
       ppb_pdf_impl_->GetFontFileWithFallback(
           instance, &desc, static_cast<PP_PrivateFontCharset>(charset)));
+
+  // SetToPPFontDescription() creates a var which is owned by the caller.
+  PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(desc.face);
 }
 
 void PPB_PDF_Proxy::OnMsgGetFontTableForPrivateFontFile(
     const HostResource& 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_impl_->GetFontTableForPrivateFontFile(
           font_file.host_resource(), table, NULL, &table_length))
     return;
 
   result->resize(table_length);
   ppb_pdf_impl_->GetFontTableForPrivateFontFile(font_file.host_resource(),
       table, const_cast<char*>(result->c_str()), &table_length);
 }
 
 }  // namespace proxy
 }  // namespace ppapi