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

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

Issue 146683003: Settings should not call into inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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 | « no previous file | Source/core/fetch/ResourceFetcher.cpp » ('j') | Source/core/inspector/InspectorPageAgent.h » ('J')
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
old mode 100644
new mode 100755
index 0e672cf9ba68eb828bf17c9a2ebd0929eecc7625..1253a5133857f161479dff9cbf83fc2d6e1f6000
--- a/Source/bindings/v8/ScriptController.cpp
+++ b/Source/bindings/v8/ScriptController.cpp
@@ -559,7 +559,7 @@ bool ScriptController::canExecuteScripts(ReasonForCallingCanExecuteScripts reaso
}
Settings* settings = m_frame->settings();
- const bool allowed = m_frame->loader().client()->allowScript(settings && settings->isScriptEnabled());
+ const bool allowed = m_frame->loader().client()->allowScript(settings && settings->scriptEnabled());
if (!allowed && reason == AboutToExecuteScript)
m_frame->loader().client()->didNotAllowScript();
return allowed;
« no previous file with comments | « no previous file | Source/core/fetch/ResourceFetcher.cpp » ('j') | Source/core/inspector/InspectorPageAgent.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698