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

Unified Diff: Source/WebCore/page/EventHandler.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/loader/NavigationScheduler.cpp ('k') | Source/WebCore/platform/chromium/PopupContainer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/EventHandler.cpp
===================================================================
--- Source/WebCore/page/EventHandler.cpp (revision 146131)
+++ Source/WebCore/page/EventHandler.cpp (working copy)
@@ -1428,7 +1428,7 @@
return true;
#endif
- UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+ UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
m_lastMouseDownUserGestureToken = gestureIndicator.currentToken();
// FIXME (bug 68185): this call should be made at another abstraction layer
@@ -1562,7 +1562,7 @@
m_frame->selection()->setCaretBlinkingSuspended(false);
- UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+ UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
// We get this instead of a second mouse-up
m_mousePressed = false;
@@ -1805,7 +1805,7 @@
if (m_lastMouseDownUserGestureToken)
gestureIndicator = adoptPtr(new UserGestureIndicator(m_lastMouseDownUserGestureToken.release()));
else
- gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingUserGesture));
+ gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingNewUserGesture));
#if ENABLE(PAN_SCROLLING)
m_autoscrollController->handleMouseReleaseEvent(mouseEvent);
@@ -3133,7 +3133,7 @@
if (!node)
return false;
- UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+ UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
UserTypingGestureIndicator typingGestureIndicator(m_frame);
if (FrameView* view = m_frame->view())
@@ -3831,7 +3831,7 @@
const Vector<PlatformTouchPoint>& points = event.touchPoints();
- UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+ UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
unsigned i;
bool freshTouchEvents = true;
« no previous file with comments | « Source/WebCore/loader/NavigationScheduler.cpp ('k') | Source/WebCore/platform/chromium/PopupContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698