From 5cc29a417bcb7b86ca8ebc4304eefa4d74a7e919 Mon Sep 17 00:00:00 2001 From: dominickn Date: Thu, 24 Mar 2016 20:06:22 -0700 Subject: Replace MouseWheel events with GestureScrollBegin in WebContentsObserver::DidGetUserInteraction crbug.com/568183 implements GestureScrollBegin for mouse wheel events. Once this has landed, the mouse event coalescing currently performed by WebContentsObserver::DidGetUserInteraction will be redundant. This CL removes the mouse event coalescing, and changes DidGetUserInteraction to fire on GestureScrollBegin events. The event type used to signal scrolls in the method is changed from MouseWheel to GestureScrollBegin, as scroll events will now be fired on mobile scrolls as well as wheel scrolls. Finally, in clients of DidGetUserInteraction, MouseWheel is replaced with GestureScrollBegin, and references to 'wheel' are replaced with 'scroll'. BUG=590612 Review URL: https://codereview.chromium.org/1748553002 Cr-Commit-Position: refs/heads/master@{#383231} --- content/public/browser/web_contents_observer.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'content/public') diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h index 226f309..a3bc77f 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -327,15 +327,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener, // The type argument specifies the kind of interaction. Direct user input // signalled through this callback includes: // 1) any mouse down event (blink::WebInputEvent::MouseDown); - // 2) the start of a mouse wheel scroll (blink::WebInputEvent::MouseWheel); + // 2) the start of a scroll (blink::WebInputEvent::GestureScrollBegin); // 3) any raw key down event (blink::WebInputEvent::RawKeyDown); // 4) any gesture tap event (blink::WebInputEvent::GestureTapDown); and // 5) a browser navigation or reload (blink::WebInputEvent::Undefined). - // The start of a mouse wheel scroll is heuristically detected: a mouse - // wheel event fired at least 0.1 seconds after any other wheel event is - // regarded as the beginning of a scroll. This matches the interval used by - // the Blink EventHandler to detect the end of scrolls. - // TODO(dominickn): replace MouseWheel with GestureScrollBegin. virtual void DidGetUserInteraction(const blink::WebInputEvent::Type type) {} // This method is invoked when a RenderViewHost of this WebContents was -- cgit v1.1