Index: ppapi/proxy/ppb_url_loader_proxy.cc |
=================================================================== |
--- ppapi/proxy/ppb_url_loader_proxy.cc (revision 74021) |
+++ ppapi/proxy/ppb_url_loader_proxy.cc (working copy) |
@@ -246,7 +246,7 @@ |
INTERFACE_ID_PPB_URL_LOADER, loader_object->host_resource())); |
} |
-const PPB_URLLoader ppb_urlloader = { |
+const PPB_URLLoader urlloader_interface = { |
&Create, |
&IsURLLoader, |
&Open, |
@@ -259,6 +259,11 @@ |
&Close |
}; |
+InterfaceProxy* CreateURLLoaderProxy(Dispatcher* dispatcher, |
+ const void* target_interface) { |
+ return new PPB_URLLoader_Proxy(dispatcher, target_interface); |
+} |
+ |
// Plugin URLLoaderTrusted implementation -------------------------------------- |
void GrantUniversalAccess(PP_Resource loader_id) { |
@@ -272,11 +277,16 @@ |
INTERFACE_ID_PPB_URL_LOADER_TRUSTED, loader_object->host_resource())); |
} |
-const PPB_URLLoaderTrusted ppb_urlloader_trusted = { |
+const PPB_URLLoaderTrusted urlloader_trusted_interface = { |
&GrantUniversalAccess, |
NULL, // RegisterStatusCallback is used internally by the proxy only. |
}; |
+InterfaceProxy* CreateURLLoaderTrustedProxy(Dispatcher* dispatcher, |
+ const void* target_interface) { |
+ return new PPB_URLLoaderTrusted_Proxy(dispatcher, target_interface); |
+} |
+ |
} // namespace |
// PPB_URLLoader_Proxy --------------------------------------------------------- |
@@ -302,14 +312,18 @@ |
return PluginResourceTracker::GetInstance()->AddResource(object); |
} |
-const void* PPB_URLLoader_Proxy::GetSourceInterface() const { |
- return &ppb_urlloader; |
+// static |
+const InterfaceProxy::Info* PPB_URLLoader_Proxy::GetInfo() { |
+ static const Info info = { |
+ &urlloader_interface, |
+ PPB_URLLOADER_INTERFACE, |
+ INTERFACE_ID_PPB_URL_LOADER, |
+ false, |
+ &CreateURLLoaderProxy, |
+ }; |
+ return &info; |
} |
-InterfaceID PPB_URLLoader_Proxy::GetInterfaceId() const { |
- return INTERFACE_ID_PPB_URL_LOADER; |
-} |
- |
bool PPB_URLLoader_Proxy::OnMessageReceived(const IPC::Message& msg) { |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(PPB_URLLoader_Proxy, msg) |
@@ -490,14 +504,18 @@ |
PPB_URLLoaderTrusted_Proxy::~PPB_URLLoaderTrusted_Proxy() { |
} |
-const void* PPB_URLLoaderTrusted_Proxy::GetSourceInterface() const { |
- return &ppb_urlloader_trusted; |
+// static |
+const InterfaceProxy::Info* PPB_URLLoaderTrusted_Proxy::GetInfo() { |
+ static const Info info = { |
+ &urlloader_trusted_interface, |
+ PPB_URLLOADERTRUSTED_INTERFACE, |
+ INTERFACE_ID_PPB_URL_LOADER_TRUSTED, |
+ true, |
+ &CreateURLLoaderTrustedProxy, |
+ }; |
+ return &info; |
} |
-InterfaceID PPB_URLLoaderTrusted_Proxy::GetInterfaceId() const { |
- return INTERFACE_ID_PPB_URL_LOADER_TRUSTED; |
-} |
- |
bool PPB_URLLoaderTrusted_Proxy::OnMessageReceived(const IPC::Message& msg) { |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(PPB_URLLoaderTrusted_Proxy, msg) |