diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 16:08:46 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 16:08:46 +0000 |
commit | 56c802fa1fd078b7f43338a7be9d016ccf582750 (patch) | |
tree | 971c45407c507904ce213c8efa274a87426a7d9c | |
parent | f574674ae65bfd387a518138ad357afa4a411a2a (diff) | |
download | chromium_src-56c802fa1fd078b7f43338a7be9d016ccf582750.zip chromium_src-56c802fa1fd078b7f43338a7be9d016ccf582750.tar.gz chromium_src-56c802fa1fd078b7f43338a7be9d016ccf582750.tar.bz2 |
Convert the Flash interfaces to no longer use GetInfo.
GetInfo is deprecated. I moved all the Flash setup for the proxy into a
separate function since I suspect we'll be moving this somewhere else in the
future to allow a non-Flash build of the proxy. I didn't change any thunk
stuff (it would be nice to convert more of these APIs) since I started and
this patch got too complicated.
I also changed the way the factory functions worked. I could save a bunch of
macros by using a template. Yay!
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/8359010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106856 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | ppapi/proxy/interface_list.cc | 75 | ||||
-rw-r--r-- | ppapi/proxy/interface_list.h | 6 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_clipboard_proxy.cc | 11 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_clipboard_proxy.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_file_proxy.cc | 23 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_file_proxy.h | 4 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_menu_proxy.cc | 21 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_menu_proxy.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_net_connector_proxy.cc | 20 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_net_connector_proxy.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_proxy.cc | 11 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_proxy.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_tcp_socket_proxy.cc | 16 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_tcp_socket_proxy.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_udp_socket_proxy.cc | 16 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_udp_socket_proxy.h | 2 |
16 files changed, 70 insertions, 145 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index 2dcc526..5f037dd 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -103,9 +103,8 @@ // 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. @@ -127,16 +126,10 @@ class NoAPIName_Proxy { 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 @@ -174,25 +167,16 @@ InterfaceList::InterfaceList() { 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()); @@ -252,6 +236,49 @@ const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const { 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 diff --git a/ppapi/proxy/interface_list.h b/ppapi/proxy/interface_list.h index f29198f..8df8903 100644 --- a/ppapi/proxy/interface_list.h +++ b/ppapi/proxy/interface_list.h @@ -52,6 +52,12 @@ class InterfaceList { typedef std::map<std::string, InterfaceInfo> NameToInterfaceInfoMap; + // Registers the Flash-specific interfaces. + // + // TODO(brettw) these should be moved somewhere separately so we can compile + // the proxy for NaCl without Flash interface support. + void AddFlashInterfaces(); + void AddProxy(ApiID id, InterfaceProxy::Factory factory); void AddPPB(const char* name, ApiID id, const void* iface); diff --git a/ppapi/proxy/ppb_flash_clipboard_proxy.cc b/ppapi/proxy/ppb_flash_clipboard_proxy.cc index 5477280..e37aff2 100644 --- a/ppapi/proxy/ppb_flash_clipboard_proxy.cc +++ b/ppapi/proxy/ppb_flash_clipboard_proxy.cc @@ -107,15 +107,8 @@ PPB_Flash_Clipboard_Proxy::~PPB_Flash_Clipboard_Proxy() { } // static -const InterfaceProxy::Info* PPB_Flash_Clipboard_Proxy::GetInfo() { - static const Info info = { - &flash_clipboard_interface, - PPB_FLASH_CLIPBOARD_INTERFACE, - API_ID_PPB_FLASH_CLIPBOARD, - false, - &CreateFlashClipboardProxy - }; - return &info; +const PPB_Flash_Clipboard* PPB_Flash_Clipboard_Proxy::GetInterface() { + return &flash_clipboard_interface; } bool PPB_Flash_Clipboard_Proxy::OnMessageReceived(const IPC::Message& msg) { diff --git a/ppapi/proxy/ppb_flash_clipboard_proxy.h b/ppapi/proxy/ppb_flash_clipboard_proxy.h index 8d7a7b5..79505fe 100644 --- a/ppapi/proxy/ppb_flash_clipboard_proxy.h +++ b/ppapi/proxy/ppb_flash_clipboard_proxy.h @@ -21,7 +21,7 @@ class PPB_Flash_Clipboard_Proxy : public InterfaceProxy { PPB_Flash_Clipboard_Proxy(Dispatcher* dispatcher); virtual ~PPB_Flash_Clipboard_Proxy(); - static const Info* GetInfo(); + static const PPB_Flash_Clipboard* GetInterface(); // InterfaceProxy implementation. virtual bool OnMessageReceived(const IPC::Message& msg); diff --git a/ppapi/proxy/ppb_flash_file_proxy.cc b/ppapi/proxy/ppb_flash_file_proxy.cc index 975c77a..e06bc32 100644 --- a/ppapi/proxy/ppb_flash_file_proxy.cc +++ b/ppapi/proxy/ppb_flash_file_proxy.cc @@ -525,15 +525,9 @@ PPB_Flash_File_ModuleLocal_Proxy::~PPB_Flash_File_ModuleLocal_Proxy() { } // static -const InterfaceProxy::Info* PPB_Flash_File_ModuleLocal_Proxy::GetInfo() { - static const Info info = { - &flash_file_modulelocal_interface, - PPB_FLASH_FILE_MODULELOCAL_INTERFACE, - API_ID_PPB_FLASH_FILE_MODULELOCAL, - true, - &CreateFlashFileModuleLocalProxy, - }; - return &info; +const PPB_Flash_File_ModuleLocal* +PPB_Flash_File_ModuleLocal_Proxy::GetInterface() { + return &flash_file_modulelocal_interface; } bool PPB_Flash_File_ModuleLocal_Proxy::OnMessageReceived( @@ -692,15 +686,8 @@ PPB_Flash_File_FileRef_Proxy::~PPB_Flash_File_FileRef_Proxy() { } // static -const InterfaceProxy::Info* PPB_Flash_File_FileRef_Proxy::GetInfo() { - static const Info info = { - &flash_file_fileref_interface, - PPB_FLASH_FILE_FILEREF_INTERFACE, - API_ID_PPB_FLASH_FILE_FILEREF, - true, - &CreateFlashFileFileRefProxy, - }; - return &info; +const PPB_Flash_File_FileRef* PPB_Flash_File_FileRef_Proxy::GetInterface() { + return &flash_file_fileref_interface; } bool PPB_Flash_File_FileRef_Proxy::OnMessageReceived( diff --git a/ppapi/proxy/ppb_flash_file_proxy.h b/ppapi/proxy/ppb_flash_file_proxy.h index b0ebb63..63ab624 100644 --- a/ppapi/proxy/ppb_flash_file_proxy.h +++ b/ppapi/proxy/ppb_flash_file_proxy.h @@ -30,7 +30,7 @@ class PPB_Flash_File_ModuleLocal_Proxy : public InterfaceProxy { PPB_Flash_File_ModuleLocal_Proxy(Dispatcher* dispatcher); virtual ~PPB_Flash_File_ModuleLocal_Proxy(); - static const Info* GetInfo(); + static const PPB_Flash_File_ModuleLocal* GetInterface(); // InterfaceProxy implementation. virtual bool OnMessageReceived(const IPC::Message& msg); @@ -75,7 +75,7 @@ class PPB_Flash_File_FileRef_Proxy : public InterfaceProxy { PPB_Flash_File_FileRef_Proxy(Dispatcher* dispatcher); virtual ~PPB_Flash_File_FileRef_Proxy(); - static const Info* GetInfo(); + static const PPB_Flash_File_FileRef* GetInterface(); // InterfaceProxy implementation. virtual bool OnMessageReceived(const IPC::Message& msg); diff --git a/ppapi/proxy/ppb_flash_menu_proxy.cc b/ppapi/proxy/ppb_flash_menu_proxy.cc index 7ef79c5..31681e7 100644 --- a/ppapi/proxy/ppb_flash_menu_proxy.cc +++ b/ppapi/proxy/ppb_flash_menu_proxy.cc @@ -11,7 +11,6 @@ #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_flash_menu_api.h" #include "ppapi/thunk/resource_creation_api.h" -#include "ppapi/thunk/thunk.h" using ppapi::thunk::EnterFunctionNoLock; using ppapi::thunk::PPB_Flash_Menu_API; @@ -75,14 +74,6 @@ void FlashMenu::ShowACK(int32_t selected_id, int32_t result) { PP_RunAndClearCompletionCallback(&callback_, result); } -namespace { - -InterfaceProxy* CreateFlashMenuProxy(Dispatcher* dispatcher) { - return new PPB_Flash_Menu_Proxy(dispatcher); -} - -} // namespace - PPB_Flash_Menu_Proxy::PPB_Flash_Menu_Proxy(Dispatcher* dispatcher) : InterfaceProxy(dispatcher), callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { @@ -92,18 +83,6 @@ PPB_Flash_Menu_Proxy::~PPB_Flash_Menu_Proxy() { } // static -const InterfaceProxy::Info* PPB_Flash_Menu_Proxy::GetInfo() { - static const Info info = { - ppapi::thunk::GetPPB_Flash_Menu_Thunk(), - PPB_FLASH_MENU_INTERFACE, - API_ID_PPB_FLASH_MENU, - true, - &CreateFlashMenuProxy, - }; - return &info; -} - -// static PP_Resource PPB_Flash_Menu_Proxy::CreateProxyResource( PP_Instance instance_id, const PP_Flash_Menu* menu_data) { diff --git a/ppapi/proxy/ppb_flash_menu_proxy.h b/ppapi/proxy/ppb_flash_menu_proxy.h index 51a4dc6..7e72fde 100644 --- a/ppapi/proxy/ppb_flash_menu_proxy.h +++ b/ppapi/proxy/ppb_flash_menu_proxy.h @@ -25,8 +25,6 @@ class PPB_Flash_Menu_Proxy : public InterfaceProxy { PPB_Flash_Menu_Proxy(Dispatcher* dispatcher); virtual ~PPB_Flash_Menu_Proxy(); - static const Info* GetInfo(); - static PP_Resource CreateProxyResource(PP_Instance instance_id, const PP_Flash_Menu* menu_data); diff --git a/ppapi/proxy/ppb_flash_net_connector_proxy.cc b/ppapi/proxy/ppb_flash_net_connector_proxy.cc index dee1027..2731cfb 100644 --- a/ppapi/proxy/ppb_flash_net_connector_proxy.cc +++ b/ppapi/proxy/ppb_flash_net_connector_proxy.cc @@ -187,14 +187,6 @@ struct PPB_Flash_NetConnector_Proxy::ConnectCallbackInfo { PP_Flash_NetAddress remote_addr; }; -namespace { - -InterfaceProxy* CreateFlashNetConnectorProxy(Dispatcher* dispatcher) { - return new PPB_Flash_NetConnector_Proxy(dispatcher); -} - -} // namespace - PPB_Flash_NetConnector_Proxy::PPB_Flash_NetConnector_Proxy( Dispatcher* dispatcher) : InterfaceProxy(dispatcher), @@ -205,18 +197,6 @@ PPB_Flash_NetConnector_Proxy::~PPB_Flash_NetConnector_Proxy() { } // static -const InterfaceProxy::Info* PPB_Flash_NetConnector_Proxy::GetInfo() { - static const Info info = { - ppapi::thunk::GetPPB_Flash_NetConnector_Thunk(), - PPB_FLASH_NETCONNECTOR_INTERFACE, - API_ID_PPB_FLASH_NETCONNECTOR, - false, - &CreateFlashNetConnectorProxy - }; - return &info; -} - -// static PP_Resource PPB_Flash_NetConnector_Proxy::CreateProxyResource( PP_Instance instance) { PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance); diff --git a/ppapi/proxy/ppb_flash_net_connector_proxy.h b/ppapi/proxy/ppb_flash_net_connector_proxy.h index 4ac6c5d..0f24466 100644 --- a/ppapi/proxy/ppb_flash_net_connector_proxy.h +++ b/ppapi/proxy/ppb_flash_net_connector_proxy.h @@ -25,8 +25,6 @@ class PPB_Flash_NetConnector_Proxy : public InterfaceProxy { PPB_Flash_NetConnector_Proxy(Dispatcher* dispatcher); virtual ~PPB_Flash_NetConnector_Proxy(); - static const Info* GetInfo(); - static PP_Resource CreateProxyResource(PP_Instance instance); // InterfaceProxy implementation. diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc index 4b23f87..6713845 100644 --- a/ppapi/proxy/ppb_flash_proxy.cc +++ b/ppapi/proxy/ppb_flash_proxy.cc @@ -187,15 +187,8 @@ PPB_Flash_Proxy::~PPB_Flash_Proxy() { } // static -const InterfaceProxy::Info* PPB_Flash_Proxy::GetInfo() { - static const Info info = { - &flash_interface, - PPB_FLASH_INTERFACE, - API_ID_PPB_FLASH, - true, - &CreateFlashProxy, - }; - return &info; +const PPB_Flash* PPB_Flash_Proxy::GetInterface() { + return &flash_interface; } bool PPB_Flash_Proxy::OnMessageReceived(const IPC::Message& msg) { diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h index 8bb15eb..2d224bd 100644 --- a/ppapi/proxy/ppb_flash_proxy.h +++ b/ppapi/proxy/ppb_flash_proxy.h @@ -32,7 +32,7 @@ class PPB_Flash_Proxy : public InterfaceProxy { PPB_Flash_Proxy(Dispatcher* dispatcher); virtual ~PPB_Flash_Proxy(); - static const Info* GetInfo(); + static const PPB_Flash* GetInterface(); // InterfaceProxy implementation. virtual bool OnMessageReceived(const IPC::Message& msg); diff --git a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc index 13de6fa5..0d5d6a5 100644 --- a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc +++ b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc @@ -49,10 +49,6 @@ class AbortCallbackTask : public Task { PP_CompletionCallback callback_; }; -InterfaceProxy* CreateFlashTCPSocketProxy(Dispatcher* dispatcher) { - return new PPB_Flash_TCPSocket_Proxy(dispatcher); -} - } // namespace class FlashTCPSocket : public PPB_Flash_TCPSocket_API, @@ -402,18 +398,6 @@ PPB_Flash_TCPSocket_Proxy::~PPB_Flash_TCPSocket_Proxy() { } // static -const InterfaceProxy::Info* PPB_Flash_TCPSocket_Proxy::GetInfo() { - static const Info info = { - thunk::GetPPB_Flash_TCPSocket_Thunk(), - PPB_FLASH_TCPSOCKET_INTERFACE, - API_ID_PPB_FLASH_TCPSOCKET, - false, - &CreateFlashTCPSocketProxy, - }; - return &info; -} - -// static PP_Resource PPB_Flash_TCPSocket_Proxy::CreateProxyResource( PP_Instance instance) { PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance); diff --git a/ppapi/proxy/ppb_flash_tcp_socket_proxy.h b/ppapi/proxy/ppb_flash_tcp_socket_proxy.h index 925a4ae..3344f2c 100644 --- a/ppapi/proxy/ppb_flash_tcp_socket_proxy.h +++ b/ppapi/proxy/ppb_flash_tcp_socket_proxy.h @@ -29,8 +29,6 @@ class PPB_Flash_TCPSocket_Proxy : public InterfaceProxy { PPB_Flash_TCPSocket_Proxy(Dispatcher* dispatcher); virtual ~PPB_Flash_TCPSocket_Proxy(); - static const Info* GetInfo(); - static PP_Resource CreateProxyResource(PP_Instance instance); // InterfaceProxy implementation. diff --git a/ppapi/proxy/ppb_flash_udp_socket_proxy.cc b/ppapi/proxy/ppb_flash_udp_socket_proxy.cc index 3fa0316..43a607c 100644 --- a/ppapi/proxy/ppb_flash_udp_socket_proxy.cc +++ b/ppapi/proxy/ppb_flash_udp_socket_proxy.cc @@ -49,10 +49,6 @@ class AbortCallbackTask : public Task { PP_CompletionCallback callback_; }; -InterfaceProxy* CreateFlashUDPSocketProxy(Dispatcher* dispatcher) { - return new PPB_Flash_UDPSocket_Proxy(dispatcher); -} - class FlashUDPSocket : public PPB_Flash_UDPSocket_API, public Resource { public: @@ -297,18 +293,6 @@ PPB_Flash_UDPSocket_Proxy::~PPB_Flash_UDPSocket_Proxy() { } // static -const InterfaceProxy::Info* PPB_Flash_UDPSocket_Proxy::GetInfo() { - static const Info info = { - ::ppapi::thunk::GetPPB_Flash_UDPSocket_Thunk(), - PPB_FLASH_UDPSOCKET_INTERFACE, - API_ID_PPB_FLASH_UDPSOCKET, - false, - &CreateFlashUDPSocketProxy, - }; - return &info; -} - -// static PP_Resource PPB_Flash_UDPSocket_Proxy::CreateProxyResource( PP_Instance instance) { PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance); diff --git a/ppapi/proxy/ppb_flash_udp_socket_proxy.h b/ppapi/proxy/ppb_flash_udp_socket_proxy.h index abeefdb..cea4dbf 100644 --- a/ppapi/proxy/ppb_flash_udp_socket_proxy.h +++ b/ppapi/proxy/ppb_flash_udp_socket_proxy.h @@ -28,8 +28,6 @@ class PPB_Flash_UDPSocket_Proxy : public InterfaceProxy { PPB_Flash_UDPSocket_Proxy(Dispatcher* dispatcher); virtual ~PPB_Flash_UDPSocket_Proxy(); - static const Info* GetInfo(); - static PP_Resource CreateProxyResource(PP_Instance instance); // InterfaceProxy implementation. |