Convert most remaining resources to use the API/thunk system. The significant

webkit/plugins/ppapi/plugin_module.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 "webkit/plugins/ppapi/plugin_module.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 15 matching lines @@
 #include "ppapi/c/dev/ppb_file_ref_dev.h"
 #include "ppapi/c/dev/ppb_file_system_dev.h"
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
 #include "ppapi/c/dev/ppb_graphics_3d_dev.h"
 #include "ppapi/c/dev/ppb_layer_compositor_dev.h"
 #include "ppapi/c/dev/ppb_opengles_dev.h"
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
+#include "ppapi/c/dev/ppb_surface_3d_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/dev/ppb_transport_dev.h"
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/c/dev/ppb_video_layer_dev.h"
 #include "ppapi/c/dev/ppb_widget_dev.h"
 #include "ppapi/c/dev/ppb_zoom_dev.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
@@ skipping 16 matching lines @@
 #include "ppapi/c/private/ppb_flash_file.h"
 #include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/c/private/ppb_proxy_private.h"
 #include "ppapi/c/private/ppb_uma_private.h"
 #include "ppapi/c/trusted/ppb_audio_trusted.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
 #include "ppapi/c/trusted/ppb_buffer_trusted.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
+#include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 #include "webkit/plugins/ppapi/callbacks.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_console_impl.h"
 #include "webkit/plugins/ppapi/ppb_crypto_impl.h"
 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
 #include "webkit/plugins/ppapi/ppb_font_impl.h"
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h"
+#include "webkit/plugins/ppapi/ppb_opengles_impl.h"
 #include "webkit/plugins/ppapi/ppb_proxy_impl.h"
 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
-#include "webkit/plugins/ppapi/ppb_transport_impl.h"
 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_url_util_impl.h"
 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h"
-#include "webkit/plugins/ppapi/ppb_widget_impl.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 #include "webkit/plugins/ppapi/var.h"
 #include "webkit/plugins/ppapi/webkit_forwarding_impl.h"
 
-#ifdef ENABLE_GPU
-#include "webkit/plugins/ppapi/ppb_context_3d_impl.h"
-#include "webkit/plugins/ppapi/ppb_gles_chromium_texture_mapping_impl.h"
-#include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h"
-#include "webkit/plugins/ppapi/ppb_opengles_impl.h"
-#include "webkit/plugins/ppapi/ppb_surface_3d_impl.h"
-#endif  // ENABLE_GPU
+using ppapi::thunk::EnterResource;
+using ppapi::thunk::PPB_Graphics2D_API;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 // Maintains all currently loaded plugin libs for validating PP_Module
 // identifiers.
 typedef std::set<PluginModule*> PluginModuleSet;
 
@@ skipping 63 matching lines @@
   &GetTickTime,
   &CallOnMainThread,
   &IsMainThread
 };
 
 // PPB_Testing -----------------------------------------------------------------
 
 PP_Bool ReadImageData(PP_Resource device_context_2d,
                       PP_Resource image,
                       const PP_Point* top_left) {
-  scoped_refptr<PPB_Graphics2D_Impl> context(
-      Resource::GetAs<PPB_Graphics2D_Impl>(device_context_2d));
-  if (!context.get())
+  EnterResource<PPB_Graphics2D_API> enter(device_context_2d, true);
+  if (enter.failed())
     return PP_FALSE;
-  return BoolToPPBool(context->ReadImageData(image, top_left));
+  return BoolToPPBool(static_cast<PPB_Graphics2D_Impl*>(enter.object())->
+      ReadImageData(image, top_left));
 }
 
 void RunMessageLoop(PP_Instance instance) {
   bool old_state = MessageLoop::current()->NestableTasksAllowed();
   MessageLoop::current()->SetNestableTasksAllowed(true);
   MessageLoop::current()->Run();
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
 void QuitMessageLoop(PP_Instance instance) {
@@ skipping 116 matching lines @@
     return PPB_URLUtil_Impl::GetInterface();
   if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0)
     return Var::GetDeprecatedInterface();
   if (strcmp(name, PPB_VAR_INTERFACE) == 0)
     return Var::GetInterface();
   if (strcmp(name, PPB_VIDEODECODER_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_VideoDecoder_Thunk();
   if (strcmp(name, PPB_VIDEOLAYER_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_VideoLayer_Thunk();
   if (strcmp(name, PPB_WIDGET_DEV_INTERFACE) == 0)
-    return PPB_Widget_Impl::GetInterface();
+    return ::ppapi::thunk::GetPPB_Widget_Thunk();
   if (strcmp(name, PPB_ZOOM_DEV_INTERFACE) == 0)
     return PluginInstance::GetZoomInterface();
 
 #ifdef ENABLE_GPU
   // This should really refer to switches::kDisable3DAPIs.
   if (!CommandLine::ForCurrentProcess()->HasSwitch("disable-3d-apis")) {
     if (strcmp(name, PPB_GRAPHICS_3D_DEV_INTERFACE) == 0)
-      return PPB_Graphics3D_Impl::GetInterface();
+      return ::ppapi::thunk::GetPPB_Graphics3D_Thunk();
     if (strcmp(name, PPB_CONTEXT_3D_DEV_INTERFACE) == 0)
-      return PPB_Context3D_Impl::GetInterface();
+      return ::ppapi::thunk::GetPPB_Context3D_Thunk();
     if (strcmp(name, PPB_CONTEXT_3D_TRUSTED_DEV_INTERFACE) == 0)
-      return PPB_Context3D_Impl::GetTrustedInterface();
+      return ::ppapi::thunk::GetPPB_Context3DTrusted_Thunk();
     if (strcmp(name, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE) == 0)
-      return PPB_GLESChromiumTextureMapping_Impl::GetInterface();
+      return ::ppapi::thunk::GetPPB_GLESChromiumTextureMapping_Thunk();
     if (strcmp(name, PPB_OPENGLES2_DEV_INTERFACE) == 0)
       return PPB_OpenGLES_Impl::GetInterface();
     if (strcmp(name, PPB_SURFACE_3D_DEV_INTERFACE) == 0)
-      return PPB_Surface3D_Impl::GetInterface();
+      return ::ppapi::thunk::GetPPB_Surface3D_Thunk();
     if (strcmp(name, PPB_LAYER_COMPOSITOR_DEV_INTERFACE) == 0)
-      return PPB_LayerCompositor_Impl::GetInterface();
+      return ::ppapi::thunk::GetPPB_LayerCompositor_Thunk();
   }
 #endif  // ENABLE_GPU
 
 #ifdef ENABLE_FLAPPER_HACKS
   if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Flash_NetConnector_Thunk();
 #endif  // ENABLE_FLAPPER_HACKS
 
 #if defined(ENABLE_P2P_APIS)
   if (strcmp(name, PPB_TRANSPORT_DEV_INTERFACE) == 0)
-    return PPB_Transport_Impl::GetInterface();
+    return ::ppapi::thunk::GetPPB_Transport_Thunk();
 #endif
 
   // Only support the testing interface when the command line switch is
   // specified. This allows us to prevent people from (ab)using this interface
   // in production code.
   if (strcmp(name, PPB_TESTING_DEV_INTERFACE) == 0) {
     if (CommandLine::ForCurrentProcess()->HasSwitch("enable-pepper-testing"))
       return &testing_interface;
   }
   return NULL;
@@ skipping 218 matching lines @@
   int retval = entry_points_.initialize_module(pp_module(), &GetInterface);
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit