Source/WebKit/chromium/src/WebFrameImpl.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/WebKit/chromium/src/WebFrameImpl.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/WebKit/chromium/src/WebFrameImpl.cpp

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

--- Source/WebKit/chromium/src/WebFrameImpl.cpp (revision 146131)

+++ Source/WebKit/chromium/src/WebFrameImpl.cpp (working copy)

@@ -879,7 +879,7 @@

// tests pass. If this isn't needed in non-test situations, we should

// consider removing this code and changing the tests.

// http://code.google.com/p/chromium/issues/detail?id=86397

- UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);

+ UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);

TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), OrdinalNumber::first());

return frame()->script()->executeScript(ScriptSourceCode(source.code, source.url, position)).v8Value();