Source/WebCore/bindings/ScriptControllerBase.cpp - Issue 6482031: Merge 77049

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/WebCore/bindings/ScriptControllerBase.cpp

Issue 6482031: Merge 77049 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/

Patch Set: Created 9 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:

Index: Source/WebCore/bindings/ScriptControllerBase.cpp

===================================================================

--- Source/WebCore/bindings/ScriptControllerBase.cpp (revision 78230)

+++ Source/WebCore/bindings/ScriptControllerBase.cpp (working copy)

@@ -90,7 +90,7 @@

String decodedURL = decodeURLEscapeSequences(url.string());

ScriptValue result;

if (xssAuditor()->canEvaluateJavaScriptURL(decodedURL))

- result = executeScript(decodedURL.substring(javascriptSchemeLength), processingUserGesture(), AllowXSS);

+ result = executeScript(decodedURL.substring(javascriptSchemeLength), false, AllowXSS);

// If executing script caused this frame to be removed from the page, we

// don't want to try to replace its document!

« no previous file with comments | « LayoutTests/fast/events/popup-blocked-from-iframe-src-expected.txt ('k') | no next file » | no next file with comments »