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

Unified Diff: third_party/WebKit/Source/core/dom/ScriptLoader.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/dom/ScriptLoader.cpp
diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp
index b2854163959db39030b57ac572c02b675b62aadb..dff9736b00d056f0905e11d4241af6742325ac23 100644
--- a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp
@@ -657,7 +657,7 @@ bool ScriptLoader::DoExecuteScript(const ScriptSourceCode& source_code) {
const ContentSecurityPolicy* csp =
element_document->GetContentSecurityPolicy();
bool should_bypass_main_world_csp =
- (frame->Script().ShouldBypassMainWorldCSP()) ||
+ (frame->GetScriptController().ShouldBypassMainWorldCSP()) ||
csp->AllowScriptWithHash(source_code.Source(),
ContentSecurityPolicy::InlineType::kBlock);
@@ -740,7 +740,8 @@ bool ScriptLoader::DoExecuteScript(const ScriptSourceCode& source_code) {
// 2. "Run the classic script given by the script's script."
// Note: This is where the script is compiled and actually executed.
- frame->Script().ExecuteScriptInMainWorld(source_code, access_control_status);
+ frame->GetScriptController().ExecuteScriptInMainWorld(source_code,
+ access_control_status);
// - "module":
// TODO(hiroshige): Implement this.
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.cpp ('k') | third_party/WebKit/Source/core/dom/StyleElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698