summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-30 16:39:55 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-30 16:39:55 +0000
commitfab5194cdc3d57b1aa253e8f18ea64ba141e9616 (patch)
treebc08f2b88a1b966408f031767d22c6ca503d3144 /webkit
parent42f5c7ef330e266261387a0c49560b500f2f7e40 (diff)
downloadchromium_src-fab5194cdc3d57b1aa253e8f18ea64ba141e9616.zip
chromium_src-fab5194cdc3d57b1aa253e8f18ea64ba141e9616.tar.gz
chromium_src-fab5194cdc3d57b1aa253e8f18ea64ba141e9616.tar.bz2
Add means for running some tests only o-o-p. Add messaging non-main thread test.
BUG=92909 TEST=included Review URL: http://codereview.chromium.org/7648033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index b5da771..c4a73e5 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -200,11 +200,16 @@ uint32_t GetLiveObjectsForInstance(PP_Instance instance_id) {
return ResourceTracker::Get()->GetLiveObjectsForInstance(instance_id);
}
+PP_Bool IsOutOfProcess() {
+ return PP_FALSE;
+}
+
const PPB_Testing_Dev testing_interface = {
&ReadImageData,
&RunMessageLoop,
&QuitMessageLoop,
- &GetLiveObjectsForInstance
+ &GetLiveObjectsForInstance,
+ &IsOutOfProcess
};
// GetInterface ----------------------------------------------------------------
@@ -364,7 +369,11 @@ const void* GetInterface(const char* name) {
// Only support the testing interface when the command line switch is
// specified. This allows us to prevent people from (ab)using this interface
// in production code.
- if (strcmp(name, PPB_TESTING_DEV_INTERFACE) == 0) {
+ // TODO(dmichael): Remove support for 0.6. Note that 0.7 only adds a function
+ // to the end, so returning an 0.7 struct for use by clients of 0.6 just
+ // works in practice.
+ if (strcmp(name, PPB_TESTING_DEV_INTERFACE) == 0 ||
+ strcmp(name, PPB_TESTING_DEV_INTERFACE_0_6) == 0) {
if (CommandLine::ForCurrentProcess()->HasSwitch("enable-pepper-testing"))
return &testing_interface;
}