Revert 87415 - Convert more interfaces to the new thunk system. This goes up to and including

ppapi/proxy/resource_creation_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/resource_creation_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/proxy/host_resource.h"
 #include "ppapi/proxy/interface_id.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_audio_config_proxy.h"
 #include "ppapi/proxy/ppb_audio_proxy.h"
 #include "ppapi/proxy/ppb_buffer_proxy.h"
 #include "ppapi/proxy/ppb_broker_proxy.h"
-#include "ppapi/proxy/ppb_file_chooser_proxy.h"
-#include "ppapi/proxy/ppb_file_ref_proxy.h"
-#include "ppapi/proxy/ppb_file_system_proxy.h"
 #include "ppapi/proxy/ppb_font_proxy.h"
 #include "ppapi/proxy/ppb_graphics_2d_proxy.h"
 #include "ppapi/proxy/ppb_image_data_proxy.h"
 #include "ppapi/shared_impl/font_impl.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace pp {
 namespace proxy {
 
 ResourceCreationProxy::ResourceCreationProxy(Dispatcher* dispatcher)
     : dispatcher_(dispatcher) {
 }
 
 ResourceCreationProxy::~ResourceCreationProxy() {
 }
 
 ::ppapi::thunk::ResourceCreationAPI*
-ResourceCreationProxy::AsResourceCreationAPI() {
+ResourceCreationProxy::AsResourceCreation() {
   return this;
 }
 
 PP_Resource ResourceCreationProxy::CreateAudio(
     PP_Instance instance,
     PP_Resource config_id,
     PPB_Audio_Callback audio_callback,
     void* user_data) {
   return PPB_Audio_Proxy::CreateProxyResource(instance, config_id,
                                               audio_callback, user_data);
@@ skipping 14 matching lines @@
 
 PP_Resource ResourceCreationProxy::CreateBroker(PP_Instance instance) {
   return PPB_Broker_Proxy::CreateProxyResource(instance);
 }
 
 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) {
-  // Not proxied yet.
-  return 0;
-}
-
-PP_Resource ResourceCreationProxy::CreateFileChooser(
-    PP_Instance instance,
-    const PP_FileChooserOptions_Dev* options) {
-  return PPB_FileChooser_Proxy::CreateProxyResource(instance, options);
-}
-
-PP_Resource ResourceCreationProxy::CreateFileIO(PP_Instance instance) {
-  // Not proxied yet.
-  return 0;
-}
-
-PP_Resource ResourceCreationProxy::CreateFileRef(PP_Resource file_system,
-                                                 const char* path) {
-  return PPB_FileRef_Proxy::CreateProxyResource(file_system, path);
-}
-
-PP_Resource ResourceCreationProxy::CreateFileSystem(
-    PP_Instance instance,
-    PP_FileSystemType_Dev type) {
-  return PPB_FileSystem_Proxy::CreateProxyResource(instance, type);
-}
-
 PP_Resource ResourceCreationProxy::CreateFontObject(
     PP_Instance instance,
     const PP_FontDescription_Dev* description) {
   if (!ppapi::FontImpl::IsPPFontDescriptionValid(*description))
     return 0;
 
   linked_ptr<Font> object(new Font(HostResource::MakeInstanceOnly(instance),
                                    *description));
   return PluginResourceTracker::GetInstance()->AddResource(object);
 }
 
-PP_Resource ResourceCreationProxy::CreateGraphics2D(PP_Instance instance,
+PP_Resource ResourceCreationProxy::CreateGraphics2D(PP_Instance pp_instance,
                                                     const PP_Size& size,
                                                     PP_Bool is_always_opaque) {
-  return PPB_Graphics2D_Proxy::CreateProxyResource(instance, size,
-                                                   is_always_opaque);
+  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(pp_instance);
+  if (!dispatcher)
+    return PP_ERROR_BADARGUMENT;
+
+  HostResource result;
+  dispatcher->Send(new PpapiHostMsg_ResourceCreation_Graphics2D(
+      INTERFACE_ID_RESOURCE_CREATION, pp_instance, size, is_always_opaque,
+      &result));
+  if (result.is_null())
+    return 0;
+  linked_ptr<Graphics2D> graphics_2d(new Graphics2D(result, size,
+                                                    is_always_opaque));
+  return PluginResourceTracker::GetInstance()->AddResource(graphics_2d);
 }
 
 PP_Resource ResourceCreationProxy::CreateImageData(PP_Instance instance,
                                                    PP_ImageDataFormat format,
                                                    const PP_Size& size,
                                                    PP_Bool init_to_zero) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
@@ skipping 84 matching lines @@
       *result_image_handle = dispatcher_->ShareHandleWithRemote(ih, false);
 #else
       *result_image_handle = ImageData::HandleFromInt(handle);
 #endif
     }
   }
 }
 
 }  // namespace proxy
 }  // namespace pp