Changeset 167867 in webkit

Timestamp:

Apr 27, 2014 7:09:02 PM (10 years ago)

Author:

eunmi15.lee@samsung.com

Message:

TouchEvent is not handled after releasing any point among touched points.
​https://bugs.webkit.org/show_bug.cgi?id=132043

Reviewed by Benjamin Poulain.

Handle TouchEvent until all touched points are released by setting
trackingTouchEvents variable to false when all points are released.

• UIProcess/WebPageProxy.cpp:

(WebKit::areAllTouchPointsReleased):
(WebKit::WebPageProxy::handleTouchEventSynchronously):
(WebKit::WebPageProxy::handleTouchEventAsynchronously):
(WebKit::WebPageProxy::handleTouchEvent):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-27  Eunmi Lee  <eunmi15.lee@samsung.com>
+
+        TouchEvent is not handled after releasing any point among touched points.
+        https://bugs.webkit.org/show_bug.cgi?id=132043
+
+        Reviewed by Benjamin Poulain.
+
+        Handle TouchEvent until all touched points are released by setting
+        trackingTouchEvents variable to false when all points are released.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::areAllTouchPointsReleased):
+        (WebKit::WebPageProxy::handleTouchEventSynchronously):
+        (WebKit::WebPageProxy::handleTouchEventAsynchronously):
+        (WebKit::WebPageProxy::handleTouchEvent):
+
 2014-04-27  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1493 +1493 @@
     return true;
 }
+
+static bool areAllTouchPointsReleased(const WebTouchEvent& event)
+{
+    for (const auto& touchPoint : event.touchPoints()) {
+        if (touchPoint.state() != WebPlatformTouchPoint::TouchReleased && touchPoint.state() != WebPlatformTouchPoint::TouchCancelled)
+            return false;
+    }
+
+    return true;
+}
 #endif
 
@@ -1514 +1524 @@
     m_process->responsivenessTimer()->stop();
 
-    if (event.type() == WebEvent::TouchEnd || event.type() == WebEvent::TouchCancel)
+    if (areAllTouchPointsReleased(event))
         m_isTrackingTouchEvents = false;
 }
@@ -1530 +1540 @@
     m_process->send(Messages::EventDispatcher::TouchEvent(m_pageID, event), 0);
 
-    if (event.type() == WebEvent::TouchEnd || event.type() == WebEvent::TouchCancel)
+    if (areAllTouchPointsReleased(event))
         m_isTrackingTouchEvents = false;
 }
-
 #elif ENABLE(TOUCH_EVENTS)
 void WebPageProxy::handleTouchEvent(const NativeWebTouchEvent& event)
@@ -1570 +1579 @@
     }
 
-    if (event.type() == WebEvent::TouchEnd || event.type() == WebEvent::TouchCancel)
+    if (areAllTouchPointsReleased(event))
         m_isTrackingTouchEvents = false;
 }