Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Issue 145013002: Revert of Only install extensions into the main world (Closed)

Created:
6 years, 11 months ago by eustas
Modified:
6 years, 11 months ago
CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org, jam
Visibility:
Public.

Description

Revert of Only install extensions into the main world (https://codereview.chromium.org/144073006/) Reason for revert: Breaks build Original issue's description: > Only install extensions into the main world > > BUG=none > R=dcarney@chromium.org > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=246322 TBR=dcarney@chromium.org,jochen@chromium.org NOTREECHECKS=true NOTRY=true BUG=none

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -5 lines) Patch
M content/renderer/render_view_impl.cc View 1 chunk +1 line, -5 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
eustas
Created Revert of Only install extensions into the main world
6 years, 11 months ago (2014-01-22 15:08:44 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/eustas@chromium.org/145013002/1
6 years, 11 months ago (2014-01-22 15:09:19 UTC) #2
commit-bot: I haz the power
6 years, 11 months ago (2014-01-22 15:09:20 UTC) #3
Failed to apply patch for content/renderer/render_view_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/renderer/render_view_impl.cc
  Hunk #1 FAILED at 3636.
  1 out of 1 hunk FAILED -- saving rejects to file
content/renderer/render_view_impl.cc.rej

Patch:       content/renderer/render_view_impl.cc
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc
b/content/renderer/render_view_impl.cc
index
013c2c0c4d380e2db8c6edbb2db736e3682a26cf..0dcfea80f694600754d251b593d0a929482d3345
100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3636,11 +3636,7 @@
   FOR_EACH_OBSERVER(RenderViewObserver, observers_,
                     DidClearWindowObject(frame, world_id));
 
-  // Only install controllers into the main world.
-  if (!world_id)
-    return;
-
-  if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION))
+  if ((enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) && (world_id == 0))
     DomAutomationController::Install(this, frame);
 
   if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION)

Powered by Google App Engine
This is Rietveld 408576698