Source/WebCore/bindings/ScriptControllerBase.cpp - Issue 12918021: Merge 145453

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 12918021: Merge 145453 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 years, 9 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 146131)

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

@@ -59,7 +59,7 @@

ScriptValue ScriptController::executeScript(const String& script, bool forceUserGesture)

{

- UserGestureIndicator gestureIndicator(forceUserGesture ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);

+ UserGestureIndicator gestureIndicator(forceUserGesture ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);

return executeScript(ScriptSourceCode(script, m_frame->document()->url()));

}