summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-30 17:33:21 +0000
committerdpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-30 17:33:21 +0000
commitba8a9e41120920c1ac340cad3bb71ae7ccb7aaba (patch)
tree1d042e7345d85d0dae754631842b01e44b51ab98 /webkit
parentf6519b09512464fe356051a39f8a43e2d581d818 (diff)
downloadchromium_src-ba8a9e41120920c1ac340cad3bb71ae7ccb7aaba.zip
chromium_src-ba8a9e41120920c1ac340cad3bb71ae7ccb7aaba.tar.gz
chromium_src-ba8a9e41120920c1ac340cad3bb71ae7ccb7aaba.tar.bz2
Revert 91150 - Define PPB_Flash_TCPSocket and PPB_Flash_SSLSocket.
TEST=None BUG=None Review URL: http://codereview.chromium.org/7191005 TBR=yzshen@chromium.org Review URL: http://codereview.chromium.org/7293001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc3
-rw-r--r--webkit/plugins/ppapi/resource_creation_impl.cc6
-rw-r--r--webkit/plugins/ppapi/resource_creation_impl.h1
3 files changed, 0 insertions, 10 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index bd7bf11..340d0e44 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -61,7 +61,6 @@
#include "ppapi/c/private/ppb_flash.h"
#include "ppapi/c/private/ppb_flash_clipboard.h"
#include "ppapi/c/private/ppb_flash_file.h"
-#include "ppapi/c/private/ppb_flash_tcp_socket.h"
#include "ppapi/c/private/ppb_instance_private.h"
#include "ppapi/c/private/ppb_pdf.h"
#include "ppapi/c/private/ppb_proxy_private.h"
@@ -274,8 +273,6 @@ const void* GetInterface(const char* name) {
return PPB_Flash_File_ModuleLocal_Impl::GetInterface();
if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk();
- if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0)
- return ::ppapi::thunk::GetPPB_Flash_TCPSocket_Thunk();
if (strcmp(name, PPB_FONT_DEV_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_Font_Thunk();
if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0)
diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc
index ef2830f..9dc2800 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.cc
+++ b/webkit/plugins/ppapi/resource_creation_impl.cc
@@ -154,12 +154,6 @@ PP_Resource ResourceCreationImpl::CreateFlashNetConnector(
return ReturnResource(new PPB_Flash_NetConnector_Impl(instance_));
}
-PP_Resource ResourceCreationImpl::CreateFlashTCPSocket(
- PP_Instance instance) {
- // Creating TCP socket resource at the renderer side is not supported.
- return 0;
-}
-
PP_Resource ResourceCreationImpl::CreateFontObject(
PP_Instance pp_instance,
const PP_FontDescription_Dev* description) {
diff --git a/webkit/plugins/ppapi/resource_creation_impl.h b/webkit/plugins/ppapi/resource_creation_impl.h
index b20df64..e970d57 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.h
+++ b/webkit/plugins/ppapi/resource_creation_impl.h
@@ -56,7 +56,6 @@ class ResourceCreationImpl : public ::ppapi::FunctionGroupBase,
virtual PP_Resource CreateFlashMenu(PP_Instance instance,
const PP_Flash_Menu* menu_data) OVERRIDE;
virtual PP_Resource CreateFlashNetConnector(PP_Instance instance) OVERRIDE;
- virtual PP_Resource CreateFlashTCPSocket(PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateFontObject(
PP_Instance instance,
const PP_FontDescription_Dev* description) OVERRIDE;