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

Unified Diff: sky/engine/core/page/EventHandler.cpp

Issue 868933003: Remove user gesture tracking (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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: sky/engine/core/page/EventHandler.cpp
diff --git a/sky/engine/core/page/EventHandler.cpp b/sky/engine/core/page/EventHandler.cpp
index 940110a6410c2381f106459d37dc9733337800d6..66b59e5287ce14c3acf00901751728b07733ef39 100644
--- a/sky/engine/core/page/EventHandler.cpp
+++ b/sky/engine/core/page/EventHandler.cpp
@@ -199,7 +199,6 @@ void EventHandler::clear()
m_mousePositionIsUnknown = true;
m_lastKnownMousePosition = IntPoint();
m_lastKnownMouseGlobalPosition = IntPoint();
- m_lastMouseDownUserGestureToken.clear();
m_mousePressNode = nullptr;
m_mousePressed = false;
m_capturesDragging = false;
@@ -208,7 +207,6 @@ void EventHandler::clear()
m_previousWheelScrolledNode = nullptr;
m_targetForTouchID.clear();
m_touchSequenceDocument.clear();
- m_touchSequenceUserGestureToken.clear();
m_scrollGestureHandlingNode = nullptr;
m_lastGestureScrollOverWidget = false;
m_previousGestureScrolledNode = nullptr;
@@ -995,9 +993,6 @@ bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent)
RefPtr<FrameView> protector(m_frame->view());
- UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
- m_frame->eventHandler().m_lastMouseDownUserGestureToken = gestureIndicator.currentToken();
-
cancelFakeMouseMoveEvent();
if (m_eventHandlerWillResetCapturingMouseEventsNode)
m_capturingMouseEventsNode = nullptr;
@@ -1205,13 +1200,6 @@ bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent)
m_frame->selection().setCaretBlinkingSuspended(false);
- OwnPtr<UserGestureIndicator> gestureIndicator;
-
- if (m_frame->eventHandler().m_lastMouseDownUserGestureToken)
- gestureIndicator = adoptPtr(new UserGestureIndicator(m_frame->eventHandler().m_lastMouseDownUserGestureToken.release()));
- else
- gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingUserGesture));
-
m_mousePressed = false;
setLastKnownMousePosition(mouseEvent);
@@ -1647,8 +1635,6 @@ bool EventHandler::handleGestureTap(const GestureEventWithHitTestResults& target
RefPtr<FrameView> protector(m_frame->view());
const PlatformGestureEvent& gestureEvent = targetedEvent.event();
- UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
-
unsigned modifierFlags = 0;
if (gestureEvent.altKey())
modifierFlags |= PlatformEvent::AltKey;
@@ -2076,8 +2062,6 @@ bool EventHandler::keyEvent(const PlatformKeyboardEvent& initialKeyEvent)
if (!node)
return false;
- UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
-
// FIXME: it would be fair to let an input method handle KeyUp events before DOM dispatch.
if (initialKeyEvent.type() == PlatformEvent::KeyUp || initialKeyEvent.type() == PlatformEvent::Char)
return !node->dispatchKeyEvent(initialKeyEvent);
@@ -2279,18 +2263,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
// there may be cases where the browser doesn't reliably release all
// touches. http://crbug.com/345372 tracks this.
m_touchSequenceDocument.clear();
- m_touchSequenceUserGestureToken.clear();
}
- OwnPtr<UserGestureIndicator> gestureIndicator;
-
- if (m_touchSequenceUserGestureToken)
- gestureIndicator = adoptPtr(new UserGestureIndicator(m_touchSequenceUserGestureToken.release()));
- else
- gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingUserGesture));
-
- m_touchSequenceUserGestureToken = gestureIndicator->currentToken();
-
ASSERT(m_frame->view());
if (m_touchSequenceDocument && (!m_touchSequenceDocument->frame() || !m_touchSequenceDocument->frame()->view())) {
// If the active touch document has no frame or view, it's probably being destroyed
@@ -2352,10 +2326,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
// If there's no document receiving touch events, then we can skip all the
// rest of this work.
if (!m_touchSequenceDocument || !m_touchSequenceDocument->frame()) {
- if (allTouchReleased) {
+ if (allTouchReleased)
m_touchSequenceDocument.clear();
- m_touchSequenceUserGestureToken.clear();
- }
return false;
}
@@ -2462,10 +2434,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
changedTouches[pointState].m_targets.add(touchTarget);
}
}
- if (allTouchReleased) {
+ if (allTouchReleased)
m_touchSequenceDocument.clear();
- m_touchSequenceUserGestureToken.clear();
- }
// Now iterate the changedTouches list and m_targets within it, sending
// events to the targets as required.

Powered by Google App Engine
This is Rietveld 408576698