Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 0dcfea80f694600754d251b593d0a929482d3345..013c2c0c4d380e2db8c6edbb2db736e3682a26cf 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -3636,7 +3636,11 @@ 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)) |
+ // Only install controllers into the main world. |
+ if (!world_id) |
+ return; |
+ |
+ if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION)) |
DomAutomationController::Install(this, frame); |
if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION) |