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 /ppapi/proxy | |
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 'ppapi/proxy')
-rw-r--r-- | ppapi/proxy/ppb_testing_proxy.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ppapi/proxy/ppb_testing_proxy.cc b/ppapi/proxy/ppb_testing_proxy.cc index bb9bad0..77d1af0 100644 --- a/ppapi/proxy/ppb_testing_proxy.cc +++ b/ppapi/proxy/ppb_testing_proxy.cc @@ -15,6 +15,7 @@ #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_input_event_api.h" +using ppapi::thunk::EnterInstance; using ppapi::thunk::EnterResource; using ppapi::thunk::PPB_InputEvent_API; @@ -87,13 +88,21 @@ void SimulateInputEvent(PP_Instance instance_id, PP_Resource input_event) { API_ID_PPB_TESTING, instance_id, input_event_data)); } +PP_Var GetDocumentURL(PP_Instance instance, PP_URLComponents_Dev* components) { + EnterInstance enter(instance); + if (enter.failed()) + return PP_MakeUndefined(); + return enter.functions()->GetDocumentURL(instance, components); +} + const PPB_Testing_Dev testing_interface = { &ReadImageData, &RunMessageLoop, &QuitMessageLoop, &GetLiveObjectsForInstance, &IsOutOfProcess, - &SimulateInputEvent + &SimulateInputEvent, + &GetDocumentURL }; InterfaceProxy* CreateTestingProxy(Dispatcher* dispatcher) { |