Refactor BrowserFont to new design

ppapi/proxy/resource_creation_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/resource_creation_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/proxy/audio_input_resource.h"
+#include "ppapi/proxy/browser_font_resource_trusted.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/file_chooser_resource.h"
 #include "ppapi/proxy/flash_device_id_resource.h"
 #include "ppapi/proxy/flash_font_file_resource.h"
 #include "ppapi/proxy/flash_menu_resource.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_proxy_delegate.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ skipping 19 matching lines @@
 #include "ppapi/proxy/printing_resource.h"
 #include "ppapi/proxy/url_request_info_resource.h"
 #include "ppapi/proxy/url_response_info_resource.h"
 #include "ppapi/proxy/video_capture_resource.h"
 #include "ppapi/proxy/websocket_resource.h"
 #include "ppapi/shared_impl/api_id.h"
 #include "ppapi/shared_impl/host_resource.h"
 #include "ppapi/shared_impl/ppb_audio_config_shared.h"
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 #include "ppapi/shared_impl/ppb_resource_array_shared.h"
-#include "ppapi/shared_impl/private/ppb_browser_font_trusted_shared.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace ppapi {
 namespace proxy {
 
 ResourceCreationProxy::ResourceCreationProxy(Dispatcher* dispatcher)
@@ skipping 225 matching lines @@
 PP_Resource ResourceCreationProxy::CreateBroker(PP_Instance instance) {
   return PPB_Broker_Proxy::CreateProxyResource(instance);
 }
 
 PP_Resource ResourceCreationProxy::CreateBrowserFont(
     PP_Instance instance,
     const PP_BrowserFont_Trusted_Description* description) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
-  return PPB_BrowserFont_Trusted_Shared::Create(
-      OBJECT_IS_PROXY, instance, *description, dispatcher->preferences());
+  scoped_refptr<BrowserFontResource_Trusted> font(
+      new BrowserFontResource_Trusted(GetConnection(),
+                                      instance,
+                                      *description,
+                                      dispatcher->preferences()));
+  if (!BrowserFontResource_Trusted::IsPPFontDescriptionValid(*description))

[brettw, 2012/11/26 23:50:37]

Also move this before creating the BrowserFontResource_Trusted object.

[victorhsieh, 2012/11/27 03:00:50]

Done.

+    return 0;
+  return font->GetReference();
 }
 
 PP_Resource ResourceCreationProxy::CreateBuffer(PP_Instance instance,
                                                 uint32_t size) {
   return PPB_Buffer_Proxy::CreateProxyResource(instance, size);
 }
 
 PP_Resource ResourceCreationProxy::CreateDirectoryReader(
     PP_Resource directory_ref) {
   NOTIMPLEMENTED();  // Not proxied yet.
@@ skipping 76 matching lines @@
 }
 
 Connection ResourceCreationProxy::GetConnection() {
   return Connection(
       PluginGlobals::Get()->plugin_proxy_delegate()->GetBrowserSender(),
       dispatcher());
 }
 
 }  // namespace proxy
 }  // namespace ppapi