diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 14:36:11 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 14:36:11 +0000 |
| commit | 03b45c73bc4bf16300b353c6492b74055e198df7 (patch) | |
| tree | dcfb7f08e11b2efae8635c2c2128ca63b61fb4ce /content/renderer/render_view_impl.cc | |
| parent | 3b09606846de310ff1bf43a009096eace2974f6c (diff) | |
| download | chromium_src-03b45c73bc4bf16300b353c6492b74055e198df7.zip chromium_src-03b45c73bc4bf16300b353c6492b74055e198df7.tar.gz chromium_src-03b45c73bc4bf16300b353c6492b74055e198df7.tar.bz2 | |
Only install extensions into the main world
BUG=none
R=dcarney@chromium.org
Review URL: https://codereview.chromium.org/144073006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.cc')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 0dcfea8..013c2c0 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) |