summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_view_impl.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 13:32:39 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 13:32:39 +0000
commite1803f813ab90579c8c6f58e75be215c7ab88af3 (patch)
tree443a01e178f612d674eedbae7ff890f0af80f648 /content/renderer/render_view_impl.cc
parenta8df616196f2a8a4b3a02b1a34afcae083bd9e48 (diff)
downloadchromium_src-e1803f813ab90579c8c6f58e75be215c7ab88af3.zip
chromium_src-e1803f813ab90579c8c6f58e75be215c7ab88af3.tar.gz
chromium_src-e1803f813ab90579c8c6f58e75be215c7ab88af3.tar.bz2
Add hack for the "DomWrapperWorld::existingWindowShellWorkaroundWorld"
This will need to be fixed in blink first BUG=none R=dcarney@chromium.org Review URL: https://codereview.chromium.org/136583003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.cc')
-rw-r--r--content/renderer/render_view_impl.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 0b53d80..7b113c9 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3654,8 +3654,10 @@ void RenderViewImpl::didClearWindowObject(WebFrame* frame, int world_id) {
FOR_EACH_OBSERVER(RenderViewObserver, observers_,
DidClearWindowObject(frame, world_id));
- if ((enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) && (world_id == 0))
+ if ((enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) &&
+ (world_id == 0 || world_id == -1)) {
DomAutomationController::Install(this, frame);
+ }
if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION)
StatsCollectionController::Install(frame);