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

Unified Diff: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

Issue 2811793005: Rename LocalFrame::Script() to GetScriptController() (Closed)
Patch Set: Created 3 years, 8 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
Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index c76c035d6a8a55018be956d5d2a2b08e98bcf51d..2c1c34e7253ac6965f983dc154cc2eb9e6fbab6e 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -782,7 +782,7 @@ ResourceRequestBlockedReason FrameFetchContext::CanRequestInternal(
// FIXME: Convert this to check the isolated world's Content Security Policy
// once webkit.org/b/104520 is solved.
bool should_bypass_main_world_csp =
- GetFrame()->Script().ShouldBypassMainWorldCSP() ||
+ GetFrame()->GetScriptController().ShouldBypassMainWorldCSP() ||
options.content_security_policy_option ==
kDoNotCheckContentSecurityPolicy;
« no previous file with comments | « third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698