diff options
author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 18:12:02 +0000 |
---|---|---|
committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 18:12:02 +0000 |
commit | 9984ca0682185909a315ed1d2d51007b04d05126 (patch) | |
tree | 3a0d0b59e5eb7a6e7c1236014dad0f16e02dbfbf /ppapi/proxy | |
parent | f4148f30946db3e5d316e3dd411eebca3bf5649c (diff) | |
download | chromium_src-9984ca0682185909a315ed1d2d51007b04d05126.zip chromium_src-9984ca0682185909a315ed1d2d51007b04d05126.tar.gz chromium_src-9984ca0682185909a315ed1d2d51007b04d05126.tar.bz2 |
Remove PPAPI dependency on 'net'.
This is needed to complete the port of the PPAPI proxy plugin-side to NaCl.
This replaces usages in ppapi of types in 'net' with simpler base types (eg. instead of IPEndPoint, use a std::vector<unsigned char> address and an int port). Also, this removes some static methods in net_address_private_impl.* that are hardly used, and removes the ppapi::NetAddressList typedef, using std::vector<PP_NetAddress_Private> instead.
BUG=116317
TEST=existing, no new functionality
Review URL: https://chromiumcodereview.appspot.com/10909154
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r-- | ppapi/proxy/ppapi_messages.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_host_resolver_private_proxy.cc | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_host_resolver_private_proxy.h | 11 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index 8528a2d..cfdc984 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -706,7 +706,7 @@ IPC_MESSAGE_ROUTED5(PpapiMsg_PPBHostResolver_ResolveACK, uint32 /* host_resolver_id */, bool /* succeeded */, std::string /* canonical_name */, - ppapi::NetAddressList /* net_address_list */) + std::vector<PP_NetAddress_Private> /* net_address_list */) #if !defined(OS_NACL) && !defined(NACL_WIN64) // PPP_Instance_Private. diff --git a/ppapi/proxy/ppb_host_resolver_private_proxy.cc b/ppapi/proxy/ppb_host_resolver_private_proxy.cc index 984ef9e..da73c09 100644 --- a/ppapi/proxy/ppb_host_resolver_private_proxy.cc +++ b/ppapi/proxy/ppb_host_resolver_private_proxy.cc @@ -107,7 +107,7 @@ void PPB_HostResolver_Private_Proxy::OnMsgResolveACK( uint32 host_resolver_id, bool succeeded, const std::string& canonical_name, - const ppapi::NetAddressList& net_address_list) { + const std::vector<PP_NetAddress_Private>& net_address_list) { if (!g_id_to_host_resolver) { NOTREACHED(); return; diff --git a/ppapi/proxy/ppb_host_resolver_private_proxy.h b/ppapi/proxy/ppb_host_resolver_private_proxy.h index 4282d3d..7e9b719 100644 --- a/ppapi/proxy/ppb_host_resolver_private_proxy.h +++ b/ppapi/proxy/ppb_host_resolver_private_proxy.h @@ -28,11 +28,12 @@ class PPB_HostResolver_Private_Proxy : public InterfaceProxy { private: // Browser->plugin message handlers. - void OnMsgResolveACK(uint32 plugin_dispatcher_id, - uint32 host_resolver_id, - bool succeeded, - const std::string& canonical_name, - const ppapi::NetAddressList& net_address_list); + void OnMsgResolveACK( + uint32 plugin_dispatcher_id, + uint32 host_resolver_id, + bool succeeded, + const std::string& canonical_name, + const std::vector<PP_NetAddress_Private>& net_address_list); DISALLOW_COPY_AND_ASSIGN(PPB_HostResolver_Private_Proxy); }; |