Changeset 140321 in webkit

Timestamp:

Jan 21, 2013, 4:06:57 AM (13 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: Do not dispatch mousemove when emulating touch event and no touch is active
​https://bugs.webkit.org/show_bug.cgi?id=107419

Reviewed by Pavel Feldman.

Source/WebCore:

mousemove event should not be dispatched when emulating touch events and mouse button is not pressed

• page/EventHandler.cpp:

(WebCore::EventHandler::dispatchSyntheticTouchEventIfEnabled):

LayoutTests:

• fast/events/touch/emulate-touch-events.html: Test that mousemove is dispatched not more than once and reset the touch event emulation flag in window.internals.settings upon test completion.
• fast/events/touch/emulated-touch-iframe.html: Reset the touch event emulation flag in window.internals.settings upon test completion.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/emulate-touch-events.html (modified) (2 diffs)
• LayoutTests/fast/events/touch/emulated-touch-iframe.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-21  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: Do not dispatch mousemove when emulating touch event and no touch is active
+        https://bugs.webkit.org/show_bug.cgi?id=107419
+
+        Reviewed by Pavel Feldman.
+
+        * fast/events/touch/emulate-touch-events.html: Test that mousemove is dispatched not more than once
+          and reset the touch event emulation flag in window.internals.settings upon test completion.
+        * fast/events/touch/emulated-touch-iframe.html:
+          Reset the touch event emulation flag in window.internals.settings upon test completion.
+
 2013-01-21  Andrey Lushnikov  <lushnikov@chromium.org>
 

trunk/LayoutTests/fast/events/touch/emulate-touch-events.html

@@ -19 +19 @@
         debug(event.type);
 
-    if (window.testRunner && touchEventsReceived == EXPECTED_TOUCH_EVENTS_TOTAL)
+    if (window.testRunner && touchEventsReceived == EXPECTED_TOUCH_EVENTS_TOTAL) {
+        window.internals.settings.setTouchEventEmulationEnabled(false);
         finishJSTest();
+    }
+}
+
+function mouseMoveCallback(e) {
+    if (!lastEvent)
+        debug("Unexpected mousemove event received before touchstart");
 }
 
@@ -26 +33 @@
 div.addEventListener("touchmove", touchEventCallback, false);
 div.addEventListener("touchend", touchEventCallback, false);
+div.addEventListener("mousemove", mouseMoveCallback, false);
 
 function verifyTouchEvent(type, totalTouchCount, changedTouchCount, targetTouchCount)

trunk/LayoutTests/fast/events/touch/emulated-touch-iframe.html

@@ -22 +22 @@
 
     debug("touchend (test will time out if broken)");
+    window.internals.settings.setTouchEventEmulationEnabled(false);
     window.testRunner.notifyDone();
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-21  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: Do not dispatch mousemove when emulating touch event and no touch is active
+        https://bugs.webkit.org/show_bug.cgi?id=107419
+
+        Reviewed by Pavel Feldman.
+
+        mousemove event should not be dispatched when emulating touch events and mouse button is not pressed
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::dispatchSyntheticTouchEventIfEnabled):
+
 2013-01-21  Andrey Lushnikov  <lushnikov@chromium.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -3982 +3982 @@
 
     if (eventType == PlatformEvent::MouseMoved && !m_touchPressed)
-        return false;
+        return true;
 
     HitTestRequest request(HitTestRequest::Active);