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

Unified Diff: Source/bindings/v8/ScriptController.cpp

Issue 137953010: Remove isolatedWorldForEnteredContext() and isolatedWorldForIsolate() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/bindings/v8/DOMWrapperWorld.cpp ('k') | Source/bindings/v8/V8Binding.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/v8/ScriptController.cpp
diff --git a/Source/bindings/v8/ScriptController.cpp b/Source/bindings/v8/ScriptController.cpp
index 4c5f7026382f396a2d1d917abd919a638351f668..fb0c619b49c857843de52b2a174beaf44991d9ce 100644
--- a/Source/bindings/v8/ScriptController.cpp
+++ b/Source/bindings/v8/ScriptController.cpp
@@ -263,7 +263,8 @@ V8WindowShell* ScriptController::windowShell(DOMWrapperWorld* world)
bool ScriptController::shouldBypassMainWorldContentSecurityPolicy()
{
- if (DOMWrapperWorld* world = isolatedWorldForEnteredContext(m_isolate))
+ DOMWrapperWorld* world = DOMWrapperWorld::current(m_isolate);
+ if (world && world->isIsolatedWorld())
return world->isolatedWorldHasContentSecurityPolicy();
return false;
}
« no previous file with comments | « Source/bindings/v8/DOMWrapperWorld.cpp ('k') | Source/bindings/v8/V8Binding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698