Changeset 106649 in webkit

Timestamp:

Feb 3, 2012 4:49:14 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Do not ASSERT on TouchStationary TouchPoint state.
​https://bugs.webkit.org/show_bug.cgi?id=77620

Patch by Allan Sandfeld Jensen <​allan.jensen@nokia.com> on 2012-02-03
Reviewed by Kenneth Rohde Christiansen.

• page/EventHandler.cpp:

(WebCore::eventNameForTouchPointState): Explicitly show that TouchStationary is asserted.
(WebCore::EventHandler::handleTouchEvent):

Remove TouchStationary from ASSERT. The value of HitTestRequest is restored to the
value it should have if hittested, but is not used.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-03  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        Do not ASSERT on TouchStationary TouchPoint state.
+        https://bugs.webkit.org/show_bug.cgi?id=77620
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * page/EventHandler.cpp:
+        (WebCore::eventNameForTouchPointState): Explicitly show that TouchStationary is asserted.
+        (WebCore::EventHandler::handleTouchEvent):
+            Remove TouchStationary from ASSERT. The value of HitTestRequest is restored to the
+            value it should have if hittested, but is not used.
+
 2012-02-03  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -3282 +3282 @@
     case PlatformTouchPoint::TouchMoved:
         return eventNames().touchmoveEvent;
+    case PlatformTouchPoint::TouchStationary:
+        // TouchStationary state is not converted to touch events, so fall through to assert.
     default:
         ASSERT_NOT_REACHED();
@@ -3337 +3339 @@
             hitType |= HitTestRequest::Release;
             break;
+        case PlatformTouchPoint::TouchStationary:
+            hitType |= HitTestRequest::Active | HitTestRequest::ReadOnly;
+            break;
         default:
             ASSERT_NOT_REACHED();
@@ -3369 +3374 @@
             touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey);
         } else
-            // No hittest is performed on move, since the target is not allowed to change anyway.
+            // No hittest is performed on move or stationary, since the target is not allowed to change anyway.
             touchTarget = m_originatingTouchPointTargets.get(touchPointTargetKey);