diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 11:24:12 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 11:24:12 +0000 |
commit | c4f80f728b24a2f4816deeaf2a76488bb20a0447 (patch) | |
tree | 8b25eb7c68857ae9cfdbf9c90dac21152f7a675e /content/renderer/java/java_bridge_dispatcher.cc | |
parent | c5f2902ee82e01df29cdb6c71e76e076e32f6178 (diff) | |
download | chromium_src-c4f80f728b24a2f4816deeaf2a76488bb20a0447.zip chromium_src-c4f80f728b24a2f4816deeaf2a76488bb20a0447.tar.gz chromium_src-c4f80f728b24a2f4816deeaf2a76488bb20a0447.tar.bz2 |
Update WebFrameClient::didClearWindowObject signature.
The callback is called both for the main and isolated worlds, the new
API indicates in which world the window object was cleared
BUG=none
R=abarth@chromium.org
Review URL: https://codereview.chromium.org/133123008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/java/java_bridge_dispatcher.cc')
-rw-r--r-- | content/renderer/java/java_bridge_dispatcher.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc index f7e435c..54aa73b 100644 --- a/content/renderer/java/java_bridge_dispatcher.cc +++ b/content/renderer/java/java_bridge_dispatcher.cc @@ -51,7 +51,8 @@ bool JavaBridgeDispatcher::OnMessageReceived(const IPC::Message& msg) { return handled; } -void JavaBridgeDispatcher::DidClearWindowObject(blink::WebFrame* web_frame) { +void JavaBridgeDispatcher::DidClearWindowObject(blink::WebFrame* web_frame, + int world_id) { // Note that we have to (re)bind all objects, as they will have been unbound // when the window object was cleared. for (ObjectMap::const_iterator iter = objects_.begin(); |