Convert the Flash interfaces to no longer use GetInfo.

ppapi/proxy/interface_list.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/interface_list.h"
 
 #include "base/memory/singleton.h"
 #include "ppapi/c/dev/ppb_buffer_dev.h"
 #include "ppapi/c/dev/ppb_char_set_dev.h"
 #include "ppapi/c/dev/ppb_console_dev.h"
@@ skipping 85 matching lines @@
 #include "ppapi/shared_impl/opengles2_impl.h"
 #include "ppapi/thunk/thunk.h"
 
 // Helper to get the proxy name PPB_Foo_Proxy given the API name PPB_Foo.
 #define PROXY_CLASS_NAME(api_name) api_name##_Proxy
 
 // Helper to get the interface ID PPB_Foo_Proxy::kApiID given the API
 // name PPB_Foo.
 #define PROXY_API_ID(api_name) PROXY_CLASS_NAME(api_name)::kApiID
 
-// Helper to get the name of the factory function CreatePPB_Foo_Proxy given
-// the API name PPB_Foo.
-#define PROXY_FACTORY_NAME(api_name) Create##api_name##_Proxy
+// Helper to get the name of the templatized factory function.
+#define PROXY_FACTORY_NAME(api_name) ProxyFactory<PROXY_CLASS_NAME(api_name)>
 
 // Helper to get the name of the thunk GetPPB_Foo_1_0_Thunk given the interface
 // struct name PPB_Foo_1_0.
 #define INTERFACE_THUNK_NAME(iface_struct) thunk::Get##iface_struct##_Thunk
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 // The interface list has interfaces with no ID listed as "NoAPIName" which
 // means there's no corresponding _Proxy object. Our macros expand this to
 // NoAPIName_Proxy, and then they look for kApiID inside it.
 //
 // This dummy class provides the correct definition for that interface ID,
 // which is "NONE".
 class NoAPIName_Proxy {
  public:
   static const ApiID kApiID = API_ID_NONE;
 };
 
-// Define factory functions for each interface type. These are of the form:
-//   InterfaceProxy* CreatePPB_URLLoader_Proxy(...
-#define PROXIED_API(api_name) \
-    InterfaceProxy* PROXY_FACTORY_NAME(api_name)(Dispatcher* dispatcher) { \
-      return new PROXY_CLASS_NAME(api_name)(dispatcher); \
-    }
-#include "ppapi/thunk/interfaces_ppb_public_stable.h"
-#include "ppapi/thunk/interfaces_ppb_public_dev.h"
-#include "ppapi/thunk/interfaces_ppb_private.h"
-#undef PROXIED_API
+template<typename ProxyClass>
+InterfaceProxy* ProxyFactory(Dispatcher* dispatcher) {
+  return new ProxyClass(dispatcher);
+}
 
 }  // namespace
 
 InterfaceList::InterfaceList() {
   memset(id_to_factory_, 0, sizeof(id_to_factory_));
 
   // Register the API factories for each of the API types. This calls AddProxy
   // for each InterfaceProxy type we support.
   #define PROXIED_API(api_name) \
       AddProxy(PROXY_API_ID(api_name), &PROXY_FACTORY_NAME(api_name));
@@ skipping 17 matching lines @@
   // proxy and the impl and there's no obvious message routing.
   AddProxy(API_ID_RESOURCE_CREATION, &ResourceCreationProxy::Create);
   AddProxy(API_ID_PPP_CLASS, &PPP_Class_Proxy::Create);
   AddPPB(PPB_CORE_INTERFACE, API_ID_PPB_CORE,
          PPB_Core_Proxy::GetPPB_Core_Interface());
   AddPPB(PPB_OPENGLES2_INTERFACE, API_ID_NONE,
          OpenGLES2Impl::GetInterface());
   AddPPB(PPB_VAR_INTERFACE, API_ID_NONE,
          GetPPB_Var_Interface());
 
+  AddFlashInterfaces();
+
   // PPB (browser) interfaces.
   AddPPB(PPB_FileChooser_Proxy::GetTrustedInfo());
-  AddPPB(PPB_Flash_Clipboard_Proxy::GetInfo());
-  AddPPB(PPB_Flash_File_FileRef_Proxy::GetInfo());
-  AddPPB(PPB_Flash_File_ModuleLocal_Proxy::GetInfo());
-  AddPPB(PPB_Flash_Menu_Proxy::GetInfo());
-  AddPPB(PPB_Flash_Proxy::GetInfo());
-  AddPPB(PPB_Flash_TCPSocket_Proxy::GetInfo());
-  AddPPB(PPB_Flash_UDPSocket_Proxy::GetInfo());
   AddPPB(PPB_Instance_Proxy::GetInfoPrivate());
   AddPPB(PPB_PDF_Proxy::GetInfo());
   AddPPB(PPB_Testing_Proxy::GetInfo());
   AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo());
   AddPPB(PPB_Var_Deprecated_Proxy::GetInfo());
 
-#ifdef ENABLE_FLAPPER_HACKS
-  AddPPB(PPB_Flash_NetConnector_Proxy::GetInfo());
-#endif
-
   // PPP (plugin) interfaces.
   AddPPP(PPP_Graphics3D_Proxy::GetInfo());
   AddPPP(PPP_InputEvent_Proxy::GetInfo());
   AddPPP(PPP_Instance_Private_Proxy::GetInfo());
   AddPPP(PPP_Instance_Proxy::GetInfo1_0());
   AddPPP(PPP_Messaging_Proxy::GetInfo());
   AddPPP(PPP_MouseLock_Proxy::GetInfo());
   AddPPP(PPP_VideoCapture_Proxy::GetInfo());
   AddPPP(PPP_VideoDecoder_Proxy::GetInfo());
 }
@@ skipping 39 matching lines @@
 }
 
 const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
   NameToInterfaceInfoMap::const_iterator found =
       name_to_plugin_info_.find(name);
   if (found == name_to_plugin_info_.end())
     return NULL;
   return found->second.iface;
 }
 
+void InterfaceList::AddFlashInterfaces() {
+  AddProxy(API_ID_PPB_FLASH_CLIPBOARD,
+           &ProxyFactory<PPB_Flash_Clipboard_Proxy>);
+  AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE, API_ID_PPB_FLASH_CLIPBOARD,
+         PPB_Flash_Clipboard_Proxy::GetInterface());
+
+  AddProxy(API_ID_PPB_FLASH_FILE_MODULELOCAL,
+           &ProxyFactory<PPB_Flash_File_ModuleLocal_Proxy>);
+  AddPPB(PPB_FLASH_FILE_MODULELOCAL_INTERFACE,
+         API_ID_PPB_FLASH_FILE_MODULELOCAL,
+         PPB_Flash_File_ModuleLocal_Proxy::GetInterface());
+
+  AddProxy(API_ID_PPB_FLASH_FILE_FILEREF,
+           &ProxyFactory<PPB_Flash_File_FileRef_Proxy>);
+  AddPPB(PPB_FLASH_FILE_FILEREF_INTERFACE, API_ID_PPB_FLASH_FILE_FILEREF,
+         PPB_Flash_File_FileRef_Proxy::GetInterface());
+
+  AddProxy(API_ID_PPB_FLASH_MENU, &ProxyFactory<PPB_Flash_Menu_Proxy>);
+  AddPPB(PPB_FLASH_MENU_INTERFACE, API_ID_PPB_FLASH_MENU,
+         thunk::GetPPB_Flash_Menu_Thunk());
+
+  AddProxy(API_ID_PPB_FLASH, &ProxyFactory<PPB_Flash_Proxy>);
+  AddPPB(PPB_FLASH_INTERFACE, API_ID_PPB_FLASH,
+         PPB_Flash_Proxy::GetInterface());
+
+  AddProxy(API_ID_PPB_FLASH_TCPSOCKET,
+           &ProxyFactory<PPB_Flash_TCPSocket_Proxy>);
+  AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE, API_ID_PPB_FLASH_TCPSOCKET,
+         thunk::GetPPB_Flash_TCPSocket_Thunk());
+
+  AddProxy(API_ID_PPB_FLASH_UDPSOCKET,
+           &ProxyFactory<PPB_Flash_UDPSocket_Proxy>);
+  AddPPB(PPB_FLASH_UDPSOCKET_INTERFACE, API_ID_PPB_FLASH_UDPSOCKET,
+         thunk::GetPPB_Flash_UDPSocket_Thunk());
+
+#ifdef ENABLE_FLAPPER_HACKS
+  AddProxy(API_ID_PPB_FLASH_NETCONNECTOR,
+           &ProxyFactory<PPB_Flash_NetConnector_Proxy>);
+  AddPPB(PPB_FLASH_NETCONNECTOR_INTERFACE, API_ID_PPB_FLASH_NETCONNECTOR,
+         thunk::GetPPB_Flash_NetConnector_Thunk());
+#endif
+}
+
 void InterfaceList::AddProxy(ApiID id,
                              InterfaceProxy::Factory factory) {
   // For interfaces with no corresponding _Proxy objects, the macros will
   // generate calls to this function with API_ID_NONE. This means we
   // should just skip adding a factory for these functions.
   if (id == API_ID_NONE)
     return;
 
   // The factory should be an exact dupe of the one we already have if it
   // has already been registered before.
@@ skipping 22 matching lines @@
   AddPPB(info->name, info->id, info->interface_ptr);
 }
 
 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {
   AddProxy(info->id, info->create_proxy);
   AddPPP(info->name, info->id, info->interface_ptr);
 }
 
 }  // namespace proxy
 }  // namespace ppapi