summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ppapi/ppapi_proxy.gypi5
-rw-r--r--ppapi/ppapi_shared.gypi17
-rw-r--r--ppapi/proxy/plugin_main_nacl.cc24
-rw-r--r--ppapi/proxy/ppapi_messages.h12
-rw-r--r--ppapi/proxy/ppapi_param_traits.cc2
-rw-r--r--ppapi/proxy/ppapi_param_traits.h2
-rw-r--r--ppapi/proxy/resource_creation_proxy.cc50
-rw-r--r--ppapi/proxy/resource_creation_proxy.h14
-rw-r--r--ppapi/shared_impl/private/ppb_host_resolver_shared.cc4
-rw-r--r--ppapi/shared_impl/private/ppb_host_resolver_shared.h2
-rw-r--r--ppapi/thunk/resource_creation_api.h10
11 files changed, 84 insertions, 58 deletions
diff --git a/ppapi/ppapi_proxy.gypi b/ppapi/ppapi_proxy.gypi
index 388a3ee..5a686d9 100644
--- a/ppapi/ppapi_proxy.gypi
+++ b/ppapi/ppapi_proxy.gypi
@@ -171,17 +171,12 @@
'proxy/ppb_flash_proxy.cc',
'proxy/ppb_flash_menu_proxy.cc',
'proxy/ppb_flash_message_loop_proxy.cc',
- 'proxy/ppb_host_resolver_private_proxy.cc',
'proxy/ppb_network_monitor_private_proxy.cc',
'proxy/ppb_pdf_proxy.cc',
'proxy/ppb_talk_private_proxy.cc',
- 'proxy/ppb_tcp_server_socket_private_proxy.cc',
- 'proxy/ppb_tcp_socket_private_proxy.cc',
'proxy/ppb_testing_proxy.cc',
- 'proxy/ppb_udp_socket_private_proxy.cc',
'proxy/ppb_video_capture_proxy.cc',
'proxy/ppb_video_decoder_proxy.cc',
- 'proxy/ppb_x509_certificate_private_proxy.cc',
'proxy/ppp_content_decryptor_private_proxy.cc',
'proxy/ppp_instance_private_proxy.cc',
'proxy/ppp_video_decoder_proxy.cc',
diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi
index a003a05..c3e67bc 100644
--- a/ppapi/ppapi_shared.gypi
+++ b/ppapi/ppapi_shared.gypi
@@ -254,11 +254,6 @@
'shared_impl/private/net_address_private_impl.cc',
'shared_impl/private/ppb_browser_font_trusted_shared.cc',
'shared_impl/private/ppb_char_set_shared.cc',
- 'shared_impl/private/ppb_host_resolver_shared.cc',
- 'shared_impl/private/ppb_tcp_server_socket_shared.cc',
- 'shared_impl/private/ppb_x509_certificate_private_shared.cc',
- 'shared_impl/private/tcp_socket_private_impl.cc',
- 'shared_impl/private/udp_socket_private_impl.cc',
'thunk/ppb_audio_input_thunk.cc',
'thunk/ppb_audio_input_trusted_thunk.cc',
'thunk/ppb_audio_trusted_thunk.cc',
@@ -282,23 +277,18 @@
'thunk/ppb_flash_message_loop_thunk.cc',
'thunk/ppb_gles_chromium_texture_mapping_thunk.cc',
'thunk/ppb_graphics_3d_trusted_thunk.cc',
- 'thunk/ppb_host_resolver_private_thunk.cc',
'thunk/ppb_image_data_trusted_thunk.cc',
'thunk/ppb_layer_compositor_thunk.cc',
'thunk/ppb_network_list_private_thunk.cc',
'thunk/ppb_network_monitor_private_thunk.cc',
'thunk/ppb_scrollbar_thunk.cc',
'thunk/ppb_talk_private_thunk.cc',
- 'thunk/ppb_tcp_server_socket_private_thunk.cc',
- 'thunk/ppb_tcp_socket_private_thunk.cc',
'thunk/ppb_transport_thunk.cc',
- 'thunk/ppb_udp_socket_private_thunk.cc',
'thunk/ppb_url_util_thunk.cc',
'thunk/ppb_video_capture_thunk.cc',
'thunk/ppb_video_decoder_thunk.cc',
'thunk/ppb_video_layer_thunk.cc',
'thunk/ppb_websocket_thunk.cc',
- 'thunk/ppb_x509_certificate_private_thunk.cc',
],
}],
# We exclude a few more things for nacl_win64, to avoid pulling in more dependencies.
@@ -307,7 +297,14 @@
'shared_impl/ppb_audio_shared.cc',
'shared_impl/ppb_graphics_3d_shared.cc',
'shared_impl/ppb_opengles2_shared.cc',
+ 'shared_impl/private/ppb_tcp_server_socket_shared.cc',
+ 'shared_impl/private/tcp_socket_private_impl.cc',
+ 'shared_impl/private/udp_socket_private_impl.cc',
'thunk/ppb_graphics_3d_thunk.cc',
+ 'thunk/ppb_tcp_server_socket_private_thunk.cc',
+ 'thunk/ppb_tcp_socket_private_thunk.cc',
+ 'thunk/ppb_udp_socket_private_thunk.cc',
+ 'thunk/ppb_x509_certificate_private_thunk.cc',
],
}],
],
diff --git a/ppapi/proxy/plugin_main_nacl.cc b/ppapi/proxy/plugin_main_nacl.cc
index 3ae5378..cbe06a7 100644
--- a/ppapi/proxy/plugin_main_nacl.cc
+++ b/ppapi/proxy/plugin_main_nacl.cc
@@ -28,8 +28,8 @@
#if defined(IPC_MESSAGE_LOG_ENABLED)
#define IPC_MESSAGE_MACROS_LOG_ENABLED
-#include "ppapi/proxy/ppapi_messages.h"
#endif
+#include "ppapi/proxy/ppapi_messages.h"
// This must match up with NACL_CHROME_INITIAL_IPC_DESC,
// defined in sel_main_chrome.h
@@ -157,8 +157,26 @@ void PpapiDispatcher::SetActiveURL(const std::string& url) {
bool PpapiDispatcher::OnMessageReceived(const IPC::Message& msg) {
IPC_BEGIN_MESSAGE_MAP(PpapiDispatcher, msg)
- IPC_MESSAGE_HANDLER(PpapiMsg_CreateNaClChannel,
- OnMsgCreateNaClChannel)
+ IPC_MESSAGE_HANDLER(PpapiMsg_CreateNaClChannel, OnMsgCreateNaClChannel)
+
+ IPC_MESSAGE_HANDLER_GENERIC(PpapiMsg_PPBTCPServerSocket_ListenACK,
+ OnPluginDispatcherMessageReceived(msg))
+ IPC_MESSAGE_HANDLER_GENERIC(PpapiMsg_PPBTCPServerSocket_AcceptACK,
+ OnPluginDispatcherMessageReceived(msg))
+ IPC_MESSAGE_HANDLER_GENERIC(PpapiMsg_PPBTCPSocket_ConnectACK,
+ OnPluginDispatcherMessageReceived(msg))
+ IPC_MESSAGE_HANDLER_GENERIC(PpapiMsg_PPBTCPSocket_SSLHandshakeACK,
+ OnPluginDispatcherMessageReceived(msg))
+ IPC_MESSAGE_HANDLER_GENERIC(PpapiMsg_PPBTCPSocket_ReadACK,
+ OnPluginDispatcherMessageReceived(msg))
+ IPC_MESSAGE_HANDLER_GENERIC(PpapiMsg_PPBTCPSocket_WriteACK,
+ OnPluginDispatcherMessageReceived(msg))
+ IPC_MESSAGE_HANDLER_GENERIC(PpapiMsg_PPBUDPSocket_RecvFromACK,
+ OnPluginDispatcherMessageReceived(msg))
+ IPC_MESSAGE_HANDLER_GENERIC(PpapiMsg_PPBUDPSocket_SendToACK,
+ OnPluginDispatcherMessageReceived(msg))
+ IPC_MESSAGE_HANDLER_GENERIC(PpapiMsg_PPBUDPSocket_BindACK,
+ OnPluginDispatcherMessageReceived(msg))
IPC_END_MESSAGE_MAP()
return true;
}
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 070d3c3..67f1959 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -255,7 +255,7 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer)
IPC_STRUCT_TRAITS_MEMBER(size)
IPC_STRUCT_TRAITS_END()
-#endif // !defined(OS_NACL)
+#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
// These are from the browser to the plugin.
// Loads the given plugin.
@@ -628,6 +628,7 @@ IPC_MESSAGE_ROUTED3(
uint32 /* plugin_dispatcher_id */,
PP_Resource /* resource */,
int32_t /* result */)
+#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_TCPSocket_Private.
IPC_MESSAGE_ROUTED5(PpapiMsg_PPBTCPSocket_ConnectACK,
@@ -670,10 +671,12 @@ IPC_MESSAGE_ROUTED4(PpapiMsg_PPBUDPSocket_SendToACK,
bool /* succeeded */,
int32_t /* bytes_written */)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_URLLoader_Trusted
IPC_MESSAGE_ROUTED1(
PpapiMsg_PPBURLLoader_UpdateProgress,
ppapi::proxy::PPBURLLoader_UpdateProgress_Params /* params */)
+#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_TCPServerSocket_Private.
@@ -705,6 +708,7 @@ IPC_MESSAGE_ROUTED5(PpapiMsg_PPBHostResolver_ResolveACK,
std::string /* canonical_name */,
ppapi::NetAddressList /* net_address_list */)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
// PPP_Instance_Private.
IPC_SYNC_MESSAGE_ROUTED1_1(PpapiMsg_PPPInstancePrivate_GetInstanceObject,
PP_Instance /* instance */,
@@ -1218,6 +1222,7 @@ IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBNetworkMonitor_Start,
uint32 /* plugin_dispatcher_id */)
IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBNetworkMonitor_Stop,
uint32 /* plugin_dispatcher_id */)
+#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_HostResolver_Private.
IPC_MESSAGE_CONTROL5(PpapiHostMsg_PPBHostResolver_Resolve,
@@ -1227,6 +1232,7 @@ IPC_MESSAGE_CONTROL5(PpapiHostMsg_PPBHostResolver_Resolve,
ppapi::HostPortPair /* host_port */,
PP_HostResolver_Private_Hint /* hint */)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_PDF
IPC_SYNC_MESSAGE_ROUTED3_1(
PpapiHostMsg_PPBPDF_GetFontFileWithFallback,
@@ -1246,6 +1252,7 @@ IPC_MESSAGE_ROUTED2(
PpapiHostMsg_PPBTalk_GetPermission,
uint32 /* plugin_dispatcher_id */,
PP_Resource /* resource */)
+#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_Testing.
IPC_SYNC_MESSAGE_ROUTED3_1(
@@ -1261,6 +1268,7 @@ IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBTesting_SimulateInputEvent,
PP_Instance /* instance */,
ppapi::InputEventData /* input_event */)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_VideoCapture_Dev.
IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBVideoCapture_Create,
PP_Instance /* instance */,
@@ -1415,6 +1423,7 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBFlashMessageLoop_Run,
int32_t /* result */)
IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBFlashMessageLoop_Quit,
ppapi::HostResource /* flash_message_loop */)
+#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_TCPSocket_Private.
IPC_SYNC_MESSAGE_CONTROL2_1(PpapiHostMsg_PPBTCPSocket_Create,
@@ -1488,6 +1497,7 @@ IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER,
bool /* succeeded */,
ppapi::PPB_X509Certificate_Fields /* result */)
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_Font.
IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies,
std::string /* result */)
diff --git a/ppapi/proxy/ppapi_param_traits.cc b/ppapi/proxy/ppapi_param_traits.cc
index a642da0..2858eaf 100644
--- a/ppapi/proxy/ppapi_param_traits.cc
+++ b/ppapi/proxy/ppapi_param_traits.cc
@@ -550,6 +550,7 @@ bool ParamTraits<ppapi::proxy::SerializedFlashMenu>::Read(const Message* m,
void ParamTraits<ppapi::proxy::SerializedFlashMenu>::Log(const param_type& p,
std::string* l) {
}
+#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
// PPB_X509Certificate_Fields --------------------------------------------------
@@ -571,6 +572,5 @@ bool ParamTraits<ppapi::PPB_X509Certificate_Fields>::Read(const Message* m,
void ParamTraits<ppapi::PPB_X509Certificate_Fields>::Log(const param_type& p,
std::string* l) {
}
-#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
} // namespace IPC
diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h
index 399513c..70600d3 100644
--- a/ppapi/proxy/ppapi_param_traits.h
+++ b/ppapi/proxy/ppapi_param_traits.h
@@ -164,6 +164,7 @@ struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedFlashMenu> {
static bool Read(const Message* m, PickleIterator* iter, param_type* r);
static void Log(const param_type& p, std::string* l);
};
+#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
template<>
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PPB_X509Certificate_Fields> {
@@ -172,7 +173,6 @@ struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PPB_X509Certificate_Fields> {
static bool Read(const Message* m, PickleIterator* iter, param_type* r);
static void Log(const param_type& p, std::string* l);
};
-#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
} // namespace IPC
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index 09b149d..a31386b 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -227,6 +227,31 @@ PP_Resource ResourceCreationProxy::CreateGraphics3DRaw(
return 0;
}
+PP_Resource ResourceCreationProxy::CreateHostResolverPrivate(
+ PP_Instance instance) {
+ return PPB_HostResolver_Private_Proxy::CreateProxyResource(instance);
+}
+
+PP_Resource ResourceCreationProxy::CreateTCPServerSocketPrivate(
+ PP_Instance instance) {
+ return PPB_TCPServerSocket_Private_Proxy::CreateProxyResource(instance);
+}
+
+PP_Resource ResourceCreationProxy::CreateTCPSocketPrivate(
+ PP_Instance instance) {
+ return PPB_TCPSocket_Private_Proxy::CreateProxyResource(instance);
+}
+
+PP_Resource ResourceCreationProxy::CreateUDPSocketPrivate(
+ PP_Instance instance) {
+ return PPB_UDPSocket_Private_Proxy::CreateProxyResource(instance);
+}
+
+PP_Resource ResourceCreationProxy::CreateX509CertificatePrivate(
+ PP_Instance instance) {
+ return PPB_X509Certificate_Private_Proxy::CreateProxyResource(instance);
+}
+
#if !defined(OS_NACL)
PP_Resource ResourceCreationProxy::CreateAudioInput0_1(
PP_Instance instance,
@@ -291,11 +316,6 @@ PP_Resource ResourceCreationProxy::CreateFlashMessageLoop(
return PPB_Flash_MessageLoop_Proxy::CreateProxyResource(instance);
}
-PP_Resource ResourceCreationProxy::CreateHostResolverPrivate(
- PP_Instance instance) {
- return PPB_HostResolver_Private_Proxy::CreateProxyResource(instance);
-}
-
PP_Resource ResourceCreationProxy::CreateNetworkMonitor(
PP_Instance instance,
PPB_NetworkMonitor_Callback callback,
@@ -314,21 +334,6 @@ PP_Resource ResourceCreationProxy::CreateTalk(PP_Instance instance) {
return PPB_Talk_Private_Proxy::CreateProxyResource(instance);
}
-PP_Resource ResourceCreationProxy::CreateTCPServerSocketPrivate(
- PP_Instance instance) {
- return PPB_TCPServerSocket_Private_Proxy::CreateProxyResource(instance);
-}
-
-PP_Resource ResourceCreationProxy::CreateTCPSocketPrivate(
- PP_Instance instance) {
- return PPB_TCPSocket_Private_Proxy::CreateProxyResource(instance);
-}
-
-PP_Resource ResourceCreationProxy::CreateUDPSocketPrivate(
- PP_Instance instance) {
- return PPB_UDPSocket_Private_Proxy::CreateProxyResource(instance);
-}
-
PP_Resource ResourceCreationProxy::CreateVideoCapture(PP_Instance instance) {
return PPB_VideoCapture_Proxy::CreateProxyResource(instance);
}
@@ -353,13 +358,8 @@ PP_Resource ResourceCreationProxy::CreateWebSocket(PP_Instance instance) {
return 0;
}
-PP_Resource ResourceCreationProxy::CreateX509CertificatePrivate(
- PP_Instance instance) {
- return PPB_X509Certificate_Private_Proxy::CreateProxyResource(instance);
-}
#endif // !defined(OS_NACL)
-
bool ResourceCreationProxy::Send(IPC::Message* msg) {
return dispatcher()->Send(msg);
}
diff --git a/ppapi/proxy/resource_creation_proxy.h b/ppapi/proxy/resource_creation_proxy.h
index 261cd0e..358b84d 100644
--- a/ppapi/proxy/resource_creation_proxy.h
+++ b/ppapi/proxy/resource_creation_proxy.h
@@ -113,6 +113,13 @@ class ResourceCreationProxy : public InterfaceProxy,
PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) OVERRIDE;
+ virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) OVERRIDE;
+ virtual PP_Resource CreateTCPServerSocketPrivate(
+ PP_Instance instance) OVERRIDE;
+ virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instance) OVERRIDE;
+ virtual PP_Resource CreateUDPSocketPrivate(PP_Instance instance) OVERRIDE;
+ virtual PP_Resource CreateX509CertificatePrivate(
+ PP_Instance instance) OVERRIDE;
#if !defined(OS_NACL)
virtual PP_Resource CreateAudioInput0_1(
PP_Instance instance,
@@ -135,7 +142,6 @@ class ResourceCreationProxy : public InterfaceProxy,
virtual PP_Resource CreateFlashMenu(PP_Instance instance,
const PP_Flash_Menu* menu_data) OVERRIDE;
virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) OVERRIDE;
- virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateNetworkMonitor(
PP_Instance instance,
PPB_NetworkMonitor_Callback callback,
@@ -143,10 +149,6 @@ class ResourceCreationProxy : public InterfaceProxy,
virtual PP_Resource CreateScrollbar(PP_Instance instance,
PP_Bool vertical) OVERRIDE;
virtual PP_Resource CreateTalk(PP_Instance instance) OVERRIDE;
- virtual PP_Resource CreateTCPServerSocketPrivate(
- PP_Instance instance) OVERRIDE;
- virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instance) OVERRIDE;
- virtual PP_Resource CreateUDPSocketPrivate(PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateVideoCapture(PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateVideoDecoder(
PP_Instance instance,
@@ -155,8 +157,6 @@ class ResourceCreationProxy : public InterfaceProxy,
virtual PP_Resource CreateVideoLayer(PP_Instance instance,
PP_VideoLayerMode_Dev mode) OVERRIDE;
virtual PP_Resource CreateWebSocket(PP_Instance instance) OVERRIDE;
- virtual PP_Resource CreateX509CertificatePrivate(
- PP_Instance instance) OVERRIDE;
#endif // !defined(OS_NACL)
virtual bool Send(IPC::Message* msg) OVERRIDE;
diff --git a/ppapi/shared_impl/private/ppb_host_resolver_shared.cc b/ppapi/shared_impl/private/ppb_host_resolver_shared.cc
index fb44ad2..13a258f 100644
--- a/ppapi/shared_impl/private/ppb_host_resolver_shared.cc
+++ b/ppapi/shared_impl/private/ppb_host_resolver_shared.cc
@@ -8,7 +8,9 @@
#include <cstring>
#include "base/memory/scoped_ptr.h"
+#if !defined(OS_NACL)
#include "net/base/address_list.h"
+#endif
#include "ppapi/c/pp_errors.h"
#include "ppapi/shared_impl/private/net_address_private_impl.h"
#include "ppapi/shared_impl/var.h"
@@ -16,6 +18,7 @@
namespace ppapi {
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
NetAddressList* CreateNetAddressListFromAddressList(
const net::AddressList& list) {
scoped_ptr<NetAddressList> net_address_list(new NetAddressList());
@@ -29,6 +32,7 @@ NetAddressList* CreateNetAddressListFromAddressList(
return net_address_list.release();
}
+#endif // !defined(OS_NACL) && !defined(NACL_WIN64)
PPB_HostResolver_Shared::PPB_HostResolver_Shared(PP_Instance instance)
: Resource(OBJECT_IS_IMPL, instance),
diff --git a/ppapi/shared_impl/private/ppb_host_resolver_shared.h b/ppapi/shared_impl/private/ppb_host_resolver_shared.h
index f4eb74a..33adaf9 100644
--- a/ppapi/shared_impl/private/ppb_host_resolver_shared.h
+++ b/ppapi/shared_impl/private/ppb_host_resolver_shared.h
@@ -27,8 +27,10 @@ struct HostPortPair {
typedef std::vector<PP_NetAddress_Private> NetAddressList;
+#if !defined(OS_NACL) && !defined(NACL_WIN64)
PPAPI_SHARED_EXPORT NetAddressList*
CreateNetAddressListFromAddressList(const net::AddressList& list);
+#endif
class PPAPI_SHARED_EXPORT PPB_HostResolver_Shared
: public thunk::PPB_HostResolver_Private_API,
diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h
index d3f53a7..19881d6 100644
--- a/ppapi/thunk/resource_creation_api.h
+++ b/ppapi/thunk/resource_creation_api.h
@@ -116,6 +116,11 @@ class ResourceCreationAPI {
virtual PP_Resource CreateGraphics3DRaw(PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) = 0;
+ virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) = 0;
+ virtual PP_Resource CreateTCPServerSocketPrivate(PP_Instance instance) = 0;
+ virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instace) = 0;
+ virtual PP_Resource CreateUDPSocketPrivate(PP_Instance instace) = 0;
+ virtual PP_Resource CreateX509CertificatePrivate(PP_Instance instance) = 0;
#if !defined(OS_NACL)
virtual PP_Resource CreateAudioInput0_1(
PP_Instance instance,
@@ -137,7 +142,6 @@ class ResourceCreationAPI {
virtual PP_Resource CreateFlashMenu(PP_Instance instance,
const PP_Flash_Menu* menu_data) = 0;
virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) = 0;
- virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) = 0;
virtual PP_Resource CreateNetworkMonitor(
PP_Instance instance,
PPB_NetworkMonitor_Callback callback,
@@ -145,9 +149,6 @@ class ResourceCreationAPI {
virtual PP_Resource CreateScrollbar(PP_Instance instance,
PP_Bool vertical) = 0;
virtual PP_Resource CreateTalk(PP_Instance instance) = 0;
- virtual PP_Resource CreateTCPServerSocketPrivate(PP_Instance instance) = 0;
- virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instace) = 0;
- virtual PP_Resource CreateUDPSocketPrivate(PP_Instance instace) = 0;
virtual PP_Resource CreateVideoCapture(PP_Instance instance) = 0;
virtual PP_Resource CreateVideoDecoder(
PP_Instance instance,
@@ -156,7 +157,6 @@ class ResourceCreationAPI {
virtual PP_Resource CreateVideoLayer(PP_Instance instance,
PP_VideoLayerMode_Dev mode) = 0;
virtual PP_Resource CreateWebSocket(PP_Instance instance) = 0;
- virtual PP_Resource CreateX509CertificatePrivate(PP_Instance instance) = 0;
#endif // !defined(OS_NACL)
static const ApiID kApiID = API_ID_RESOURCE_CREATION;
generated by cgit v1.1 at 2025-02-06 12:23:48 +0000