diff options
Diffstat (limited to 'webkit/plugins/ppapi/plugin_module.cc')
| -rw-r--r-- | webkit/plugins/ppapi/plugin_module.cc | 13 |
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; } |