summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/ppapi
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 06:15:39 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 06:15:39 +0000
commit0edbfc86d6080cc7b3c65d3bd3e3867ab40d8e04 (patch)
tree174926eefd1cb8158325cee5cfc54667a81337cb /webkit/plugins/ppapi
parentcce836eea3969a9cc3730098d2ab91847c3616a7 (diff)
downloadchromium_src-0edbfc86d6080cc7b3c65d3bd3e3867ab40d8e04.zip
chromium_src-0edbfc86d6080cc7b3c65d3bd3e3867ab40d8e04.tar.gz
chromium_src-0edbfc86d6080cc7b3c65d3bd3e3867ab40d8e04.tar.bz2
Introduce PPB_HostResolver_Dev.
This change exposes the PPB_HostResolver_Dev interface and makes it to share the same backend as PPB_HostResolver_Private. It doesn't include apps permission check, which will be implemented in separate CLs. BUG=247225 TEST=newly added test_host_resolver.{h,cc}. Review URL: https://chromiumcodereview.appspot.com/16727002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi')
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc1
-rw-r--r--webkit/plugins/ppapi/resource_creation_impl.cc4
-rw-r--r--webkit/plugins/ppapi/resource_creation_impl.h1
3 files changed, 6 insertions, 0 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index efae9b9..8c87468 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -24,6 +24,7 @@
#include "ppapi/c/dev/ppb_font_dev.h"
#include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
#include "ppapi/c/dev/ppb_graphics_2d_dev.h"
+#include "ppapi/c/dev/ppb_host_resolver_dev.h"
#include "ppapi/c/dev/ppb_memory_dev.h"
#include "ppapi/c/dev/ppb_net_address_dev.h"
#include "ppapi/c/dev/ppb_opengles2ext_dev.h"
diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc
index 4c80cb0..27b0661 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.cc
+++ b/webkit/plugins/ppapi/resource_creation_impl.cc
@@ -125,6 +125,10 @@ PP_Resource ResourceCreationImpl::CreateGraphics3DRaw(
return PPB_Graphics3D_Impl::CreateRaw(instance, share_context, attrib_list);
}
+PP_Resource ResourceCreationImpl::CreateHostResolver(PP_Instance instance) {
+ return 0; // Not supported in-process.
+}
+
PP_Resource ResourceCreationImpl::CreateHostResolverPrivate(
PP_Instance instance) {
return 0; // Not supported in-process.
diff --git a/webkit/plugins/ppapi/resource_creation_impl.h b/webkit/plugins/ppapi/resource_creation_impl.h
index 53196ff..2c6dc84 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.h
+++ b/webkit/plugins/ppapi/resource_creation_impl.h
@@ -57,6 +57,7 @@ class WEBKIT_PLUGINS_EXPORT ResourceCreationImpl
virtual PP_Resource CreateGraphics3DRaw(PP_Instance instance,
PP_Resource share_context,
const int32_t* attrib_list) OVERRIDE;
+ virtual PP_Resource CreateHostResolver(PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateImageData(
PP_Instance instance,