Changeset 63807 in webkit

Timestamp:

Jul 21, 2010 2:19:02 AM (14 years ago)

Author:

benm@google.com

Message:

Touch events do not affect the :active CSS state
​https://bugs.webkit.org/show_bug.cgi?id=39493

Reviewed by Steve Block.

WebCore:

Test: fast/events/touch/touch-active-state.html

• WebCore.exp.in: Update exports for new signature of

hitTestResultAtPoint.

• WebCore.order: ditto.
• page/EventHandler.cpp:

(WebCore::EventHandler::EventHandler):
(WebCore::EventHandler::hitTestResultAtPoint): Pass the type

of the hit test to perform as a parameter with a default
value rather than harcoding it in the function body.

(WebCore::EventHandler::handleMouseMoveEvent): Do not modiify

the active element during a mouse move if the user is
touching the screen.

(WebCore::EventHandler::handleTouchEvent): Set the correct

type of hit test to perform depending on the type of the
touch event we are handling.

• page/EventHandler.h: Update the signature of hitTestResultAtPoint.

LayoutTests:

• fast/events/touch/touch-active-state-expected.txt: Added.
• fast/events/touch/touch-active-state.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/touch-active-state-expected.txt (added)
• LayoutTests/fast/events/touch/touch-active-state.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/WebCore.order (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (5 diffs)
• WebCore/page/EventHandler.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-20  Ben Murdoch  <benm@google.com>
+
+        Reviewed by Steve Block.
+
+        Touch events do not affect the :active CSS state
+        https://bugs.webkit.org/show_bug.cgi?id=39493
+
+        * fast/events/touch/touch-active-state-expected.txt: Added.
+        * fast/events/touch/touch-active-state.html: Added.
+
 2010-07-20  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-20  Ben Murdoch  <benm@google.com>
+
+        Reviewed by Steve Block.
+
+        Touch events do not affect the :active CSS state
+        https://bugs.webkit.org/show_bug.cgi?id=39493
+
+        Test: fast/events/touch/touch-active-state.html
+
+        * WebCore.exp.in: Update exports for new signature of
+            hitTestResultAtPoint.
+        * WebCore.order: ditto.
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::EventHandler):
+        (WebCore::EventHandler::hitTestResultAtPoint): Pass the type
+            of the hit test to perform as a parameter with a default
+            value rather than harcoding it in the function body.
+        (WebCore::EventHandler::handleMouseMoveEvent): Do not modiify
+            the active element during a mouse move if the user is
+            touching the screen.
+        (WebCore::EventHandler::handleTouchEvent): Set the correct
+            type of hit test to perform depending on the type of the
+            touch event we are handling.
+        * page/EventHandler.h: Update the signature of hitTestResultAtPoint.
+
 2010-07-20  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/WebCore.exp.in

@@ -217 +217 @@
 __ZN7WebCore12EventHandler16handleWheelEventERNS_18PlatformWheelEventE
 __ZN7WebCore12EventHandler20handleTextInputEventERKNS_6StringEPNS_5EventEbb
-__ZN7WebCore12EventHandler20hitTestResultAtPointERKNS_8IntPointEbbNS_17HitTestScrollbarsE
+__ZN7WebCore12EventHandler20hitTestResultAtPointERKNS_8IntPointEbbNS_17HitTestScrollbarsEi
 __ZN7WebCore12EventHandler21handleMousePressEventERKNS_18PlatformMouseEventE
 __ZN7WebCore12EventHandler23handleMouseReleaseEventERKNS_18PlatformMouseEventE

trunk/WebCore/WebCore.order

@@ -3000 +3000 @@
 __ZNK7WebCore14RenderThemeMac20supportsControlTintsEv
 __ZN7WebCore15GraphicsContext23setUpdatingControlTintsEb
-__ZN7WebCore12EventHandler20hitTestResultAtPointERKNS_8IntPointEbbNS_17HitTestScrollbarsE
+__ZN7WebCore12EventHandler20hitTestResultAtPointERKNS_8IntPointEbbNS_17HitTestScrollbarsEi
 __ZNK7WebCore13HitTestResult10isSelectedEv
 __ZN7WebCore19SelectionController8containsERKNS_8IntPointE

trunk/WebCore/page/EventHandler.cpp

@@ -191 +191 @@
     , m_activationEventNumber(0)
 #endif
+#if ENABLE(TOUCH_EVENTS)
+    , m_touchPressed(false)
+#endif
 {
 }
@@ -860 +863 @@
 #endif // ENABLE(DRAG_SUPPORT)
     
-HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars)
+HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars, int hitType)
 {
     HitTestResult result(point);
     if (!m_frame->contentRenderer())
         return result;
-    int hitType = HitTestRequest::ReadOnly | HitTestRequest::Active;
     if (ignoreClipping)
         hitType |= HitTestRequest::IgnoreClipping;
@@ -1442 +1444 @@
     if (m_mousePressed)
         hitType |= HitTestRequest::Active;
+
+#if ENABLE(TOUCH_EVENTS)
+    // Treat any mouse move events as readonly if the user is currently touching the screen.
+    if (m_touchPressed)
+        hitType |= HitTestRequest::Active | HitTestRequest::ReadOnly;
+#endif
     HitTestRequest request(hitType);
     MouseEventWithHitTestResults mev = prepareMouseEvent(request, mouseEvent);
@@ -2839 +2847 @@
         const PlatformTouchPoint& point = points[i];
         IntPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos());
-        HitTestResult result = hitTestResultAtPoint(pagePoint, /*allowShadowContent*/ false);
+
+        int hitType = HitTestRequest::Active | HitTestRequest::ReadOnly;
+        // The HitTestRequest types used for mouse events map quite adequately
+        // to touch events. Note that in addition to meaning that the hit test
+        // should affect the active state of the current node if necessary,
+        // HitTestRequest::Active signifies that the hit test is taking place
+        // with the mouse (or finger in this case) being pressed.
+        switch (point.state()) {
+        case PlatformTouchPoint::TouchPressed:
+            hitType = HitTestRequest::Active;
+            break;
+        case PlatformTouchPoint::TouchMoved:
+            hitType = HitTestRequest::Active | HitTestRequest::MouseMove | HitTestRequest::ReadOnly;
+            break;
+        case PlatformTouchPoint::TouchReleased:
+        case PlatformTouchPoint::TouchCancelled:
+            hitType = HitTestRequest::MouseUp;
+            break;
+        default:
+            break;
+        }
+
+        HitTestResult result = hitTestResultAtPoint(pagePoint, /*allowShadowContent*/ false, false, DontHitTestScrollbars, hitType);
         Node* target = result.innerNode();
 
@@ -2902 +2932 @@
     }
 
+    m_touchPressed = touches->length() > 0;
+
     bool defaultPrevented = false;
     Touch* changedTouch = 0;

trunk/WebCore/page/EventHandler.h

@@ -29 +29 @@
 #include "DragActions.h"
 #include "FocusDirection.h"
+#include "HitTestRequest.h"
 #include "PlatformMouseEvent.h"
 #include "ScrollTypes.h"
@@ -106 +107 @@
     void dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad&);
 
-    HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars);
+    HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, int hitType = HitTestRequest::ReadOnly | HitTestRequest::Active);
 
     bool mousePressed() const { return m_mousePressed; }
@@ -432 +433 @@
     typedef HashMap<int, RefPtr<EventTarget> > TouchTargetMap;
     TouchTargetMap m_originatingTouchPointTargets;
+    bool m_touchPressed;
 #endif
 };