summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/ppapi
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-30 17:19:02 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-30 17:19:02 +0000
commit24498a8e674e456f5d778f3e192d886fa4573ec9 (patch)
tree3a01d312cd4fc1bc5b329b05e04f4e21acd380d2 /webkit/plugins/ppapi
parenta64ccdb0c5dbe674a3cdc368ab758fdde0b4a5d9 (diff)
downloadchromium_src-24498a8e674e456f5d778f3e192d886fa4573ec9.zip
chromium_src-24498a8e674e456f5d778f3e192d886fa4573ec9.tar.gz
chromium_src-24498a8e674e456f5d778f3e192d886fa4573ec9.tar.bz2
Define PPB_Flash_TCPSocket and PPB_Flash_SSLSocket.
TEST=None BUG=None Review URL: http://codereview.chromium.org/7191005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi')
-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, 10 insertions, 0 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 340d0e44..bd7bf11 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -61,6 +61,7 @@
#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"
@@ -273,6 +274,8 @@ 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 9dc2800..ef2830f 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.cc
+++ b/webkit/plugins/ppapi/resource_creation_impl.cc
@@ -154,6 +154,12 @@ 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 e970d57..b20df64 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.h
+++ b/webkit/plugins/ppapi/resource_creation_impl.h
@@ -56,6 +56,7 @@ 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;