diff options
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 | ||||
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.cc | 14 | ||||
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.h | 8 | ||||
-rw-r--r-- | webkit/plugins/ppapi/plugin_delegate.h | 12 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppb_host_resolver_private_impl.cc | 38 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppb_host_resolver_private_impl.h | 29 | ||||
-rw-r--r-- | webkit/plugins/ppapi/resource_creation_impl.cc | 7 | ||||
-rw-r--r-- | webkit/plugins/ppapi/resource_creation_impl.h | 1 |
8 files changed, 6 insertions, 105 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 6ad0de3..34b6960 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -223,8 +223,6 @@ '../plugins/ppapi/ppb_graphics_2d_impl.h', '../plugins/ppapi/ppb_graphics_3d_impl.cc', '../plugins/ppapi/ppb_graphics_3d_impl.h', - '../plugins/ppapi/ppb_host_resolver_private_impl.cc', - '../plugins/ppapi/ppb_host_resolver_private_impl.h', '../plugins/ppapi/ppb_image_data_impl.cc', '../plugins/ppapi/ppb_image_data_impl.h', '../plugins/ppapi/ppb_network_monitor_private_impl.cc', diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc index e60a6ef..6df3dd9 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.cc +++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc @@ -285,20 +285,6 @@ void MockPluginDelegate::TCPServerSocketStopListening( uint32 socket_id) { } -void MockPluginDelegate::RegisterHostResolver( - ::ppapi::PPB_HostResolver_Shared* host_resolver, - uint32 host_resolver_id) { -} - -void MockPluginDelegate::HostResolverResolve( - uint32 host_resolver_id, - const ::ppapi::HostPortPair& host_port, - const PP_HostResolver_Private_Hint* hint) { -} - -void MockPluginDelegate::UnregisterHostResolver(uint32 host_resolver_id) { -} - bool MockPluginDelegate::AddNetworkListObserver( webkit_glue::NetworkListObserver* observer) { return false; diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h index c4c1342..64bbdfe 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.h +++ b/webkit/plugins/ppapi/mock_plugin_delegate.h @@ -132,14 +132,6 @@ class MockPluginDelegate : public PluginDelegate { virtual void TCPServerSocketAccept(uint32 server_socket_id); virtual void TCPServerSocketStopListening(PP_Resource socket_resource, uint32 socket_id); - virtual void RegisterHostResolver( - ::ppapi::PPB_HostResolver_Shared* host_resolver, - uint32 host_resolver_id); - virtual void HostResolverResolve( - uint32 host_resolver_id, - const ::ppapi::HostPortPair& host_port, - const PP_HostResolver_Private_Hint* hint); - virtual void UnregisterHostResolver(uint32 host_resolver_id); // Add/remove a network list observer. virtual bool AddNetworkListObserver( webkit_glue::NetworkListObserver* observer) OVERRIDE; diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h index 5b7b923..11f43ec 100644 --- a/webkit/plugins/ppapi/plugin_delegate.h +++ b/webkit/plugins/ppapi/plugin_delegate.h @@ -38,7 +38,6 @@ class GURL; class SkBitmap; class SkCanvas; class TransportDIB; -struct PP_HostResolver_Private_Hint; struct PP_NetAddress_Private; namespace WebKit { @@ -64,7 +63,6 @@ class CommandBuffer; namespace ppapi { class PepperFilePath; -class PPB_HostResolver_Shared; class PPB_X509Certificate_Fields; struct DeviceRefData; struct HostPortPair; @@ -556,16 +554,6 @@ class PluginDelegate { PP_Resource socket_resource, uint32 socket_id) = 0; - // For PPB_HostResolver_Private. - virtual void RegisterHostResolver( - ::ppapi::PPB_HostResolver_Shared* host_resolver, - uint32 host_resolver_id) = 0; - virtual void HostResolverResolve( - uint32 host_resolver_id, - const ::ppapi::HostPortPair& host_port, - const PP_HostResolver_Private_Hint* hint) = 0; - virtual void UnregisterHostResolver(uint32 host_resolver_id) = 0; - // Add/remove a network list observer. virtual bool AddNetworkListObserver( webkit_glue::NetworkListObserver* observer) = 0; diff --git a/webkit/plugins/ppapi/ppb_host_resolver_private_impl.cc b/webkit/plugins/ppapi/ppb_host_resolver_private_impl.cc deleted file mode 100644 index 9e63d3e..0000000 --- a/webkit/plugins/ppapi/ppb_host_resolver_private_impl.cc +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2012 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 "webkit/plugins/ppapi/ppb_host_resolver_private_impl.h" - -#include "webkit/plugins/ppapi/host_globals.h" -#include "webkit/plugins/ppapi/plugin_delegate.h" -#include "webkit/plugins/ppapi/resource_helper.h" - -namespace webkit { -namespace ppapi { - -PPB_HostResolver_Private_Impl::PPB_HostResolver_Private_Impl( - PP_Instance instance) - : ::ppapi::PPB_HostResolver_Shared(instance) { - PluginDelegate* plugin_delegate = ResourceHelper::GetPluginDelegate(this); - if (plugin_delegate) - plugin_delegate->RegisterHostResolver(this, host_resolver_id_); -} - -PPB_HostResolver_Private_Impl::~PPB_HostResolver_Private_Impl() { - PluginDelegate* plugin_delegate = ResourceHelper::GetPluginDelegate(this); - if (plugin_delegate) - plugin_delegate->UnregisterHostResolver(host_resolver_id_); -} - -void PPB_HostResolver_Private_Impl::SendResolve( - const ::ppapi::HostPortPair& host_port, - const PP_HostResolver_Private_Hint* hint) { - PluginDelegate* plugin_delegate = ResourceHelper::GetPluginDelegate(this); - if (!plugin_delegate) - return; - plugin_delegate->HostResolverResolve(host_resolver_id_, host_port, hint); -} - -} // namespace ppapi -} // namespace webkit diff --git a/webkit/plugins/ppapi/ppb_host_resolver_private_impl.h b/webkit/plugins/ppapi/ppb_host_resolver_private_impl.h deleted file mode 100644 index 9d42ca0..0000000 --- a/webkit/plugins/ppapi/ppb_host_resolver_private_impl.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2012 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. - -#ifndef WEBKIT_PLUGINS_PPAPI_PPB_HOST_RESOLVER_PRIVATE_IMPL_H_ -#define WEBKIT_PLUGINS_PPAPI_PPB_HOST_RESOLVER_PRIVATE_IMPL_H_ - -#include "base/compiler_specific.h" -#include "ppapi/shared_impl/private/ppb_host_resolver_shared.h" - -namespace webkit { -namespace ppapi { - -class PPB_HostResolver_Private_Impl : public ::ppapi::PPB_HostResolver_Shared { - public: - explicit PPB_HostResolver_Private_Impl(PP_Instance instance); - virtual ~PPB_HostResolver_Private_Impl(); - - virtual void SendResolve(const ::ppapi::HostPortPair& host_port, - const PP_HostResolver_Private_Hint* hint) OVERRIDE; - - private: - DISALLOW_COPY_AND_ASSIGN(PPB_HostResolver_Private_Impl); -}; - -} // namespace ppapi -} // namespace webkit - -#endif // WEBKIT_PLUGINS_PPAPI_PPB_HOST_RESOLVER_PRIVATE_IMPL_H_ diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc index 7d68ba6..2fc7385 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.cc +++ b/webkit/plugins/ppapi/resource_creation_impl.cc @@ -18,7 +18,6 @@ #include "webkit/plugins/ppapi/ppb_file_system_impl.h" #include "webkit/plugins/ppapi/ppb_flash_message_loop_impl.h" #include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h" -#include "webkit/plugins/ppapi/ppb_host_resolver_private_impl.h" #include "webkit/plugins/ppapi/ppb_image_data_impl.h" #include "webkit/plugins/ppapi/ppb_network_monitor_private_impl.h" #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h" @@ -132,7 +131,7 @@ PP_Resource ResourceCreationImpl::CreateGraphics3DRaw( PP_Resource ResourceCreationImpl::CreateHostResolverPrivate( PP_Instance instance) { - return (new PPB_HostResolver_Private_Impl(instance))->GetReference(); + return 0; // Not supported in-process. } PP_Resource ResourceCreationImpl::CreateImageData(PP_Instance instance, @@ -235,6 +234,10 @@ PP_Resource ResourceCreationImpl::CreateTCPSocketPrivate(PP_Instance instance) { return PPB_TCPSocket_Private_Impl::CreateResource(instance); } +PP_Resource ResourceCreationImpl::CreateUDPSocketPrivate(PP_Instance instance) { + return 0; // Not supported in-process. +} + PP_Resource ResourceCreationImpl::CreateURLLoader(PP_Instance instance) { return (new PPB_URLLoader_Impl(instance, false))->GetReference(); } diff --git a/webkit/plugins/ppapi/resource_creation_impl.h b/webkit/plugins/ppapi/resource_creation_impl.h index c6bd66a..27a69f4 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.h +++ b/webkit/plugins/ppapi/resource_creation_impl.h @@ -105,6 +105,7 @@ class WEBKIT_PLUGINS_EXPORT ResourceCreationImpl 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 CreateURLLoader(PP_Instance instance) OVERRIDE; virtual PP_Resource CreateVideoCapture(PP_Instance instance) OVERRIDE; virtual PP_Resource CreateVideoDecoder( |