diff options
| author | ygorshenin@google.com <ygorshenin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 15:29:19 +0000 |
|---|---|---|
| committer | ygorshenin@google.com <ygorshenin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 15:29:19 +0000 |
| commit | 961e89716c14bd6c7e1f3394b9696ee60810a676 (patch) | |
| tree | 258a13f7cbd6a8b971f2fca1aad36dbcff9b2f9a /webkit | |
| parent | 292a635a2c28ac2968940fb9e15f93be45ada4dd (diff) | |
| download | chromium_src-961e89716c14bd6c7e1f3394b9696ee60810a676.zip chromium_src-961e89716c14bd6c7e1f3394b9696ee60810a676.tar.gz chromium_src-961e89716c14bd6c7e1f3394b9696ee60810a676.tar.bz2 | |
GetDocumentURL is added to PPB_Testing_Dev.
Fixed Test{TCP|UDP}SocketPrivateShared.
BUG=105863
TEST=
Review URL: http://codereview.chromium.org/8840007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -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 d86c222..6154817 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -239,13 +239,21 @@ void SimulateInputEvent(PP_Instance instance, PP_Resource input_event) { plugin_instance->SimulateInputEvent(input_event_data); } +PP_Var GetDocumentURL(PP_Instance instance, PP_URLComponents_Dev* components) { + PluginInstance* plugin_instance = host_globals->GetInstance(instance); + if (!plugin_instance) + return PP_MakeUndefined(); + return plugin_instance->GetDocumentURL(instance, components); +} + const PPB_Testing_Dev testing_interface = { &ReadImageData, &RunMessageLoop, &QuitMessageLoop, &GetLiveObjectsForInstance, &IsOutOfProcess, - &SimulateInputEvent + &SimulateInputEvent, + &GetDocumentURL }; // GetInterface ---------------------------------------------------------------- @@ -340,7 +348,8 @@ const void* GetInterface(const char* name) { if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnablePepperTesting)) { if (strcmp(name, PPB_TESTING_DEV_INTERFACE) == 0 || - strcmp(name, PPB_TESTING_DEV_INTERFACE_0_7) == 0) { + strcmp(name, PPB_TESTING_DEV_INTERFACE_0_7) == 0 || + strcmp(name, PPB_TESTING_DEV_INTERFACE_0_8) == 0) { return &testing_interface; } } |