Source/bindings/core/v8/ScriptController.cpp - Issue 313173012: HTMLParser should use current value of scriptEnabled flag

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 313173012: HTMLParser should use current value of scriptEnabled flag (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@WebKit-ADD

Patch Set: Created 6 years, 5 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: Source/bindings/core/v8/ScriptController.cpp

diff --git a/Source/bindings/core/v8/ScriptController.cpp b/Source/bindings/core/v8/ScriptController.cpp

index 7dc3212123de7f2577d90115dc8648409b2215d2..17bfc74d91f43c75612f57bd604afb3af7be0bff 100644

--- a/Source/bindings/core/v8/ScriptController.cpp

+++ b/Source/bindings/core/v8/ScriptController.cpp

@@ -499,8 +499,7 @@ bool ScriptController::canExecuteScripts(ReasonForCallingCanExecuteScripts reaso

return true;

}

- Settings* settings = m_frame->settings();

- const bool allowed = m_frame->loader().client()->allowScript(settings && settings->scriptEnabled())

+ const bool allowed = m_frame->document()->scriptEnabled()

|| isInPrivateScriptIsolateWorld(m_isolate);

if (!allowed && reason == AboutToExecuteScript)

m_frame->loader().client()->didNotAllowScript();

« no previous file with comments | « LayoutTests/http/tests/xsl/xslt-transform-with-javascript-disabled.html ('k') | Source/core/dom/Document.h » ('j') | no next file with comments »