Changeset 74015 in webkit

Timestamp:

Dec 14, 2010 4:10:45 AM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

2010-12-14 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

WebKit 2 does not send touch cancel events correctly between processes
​https://bugs.webkit.org/show_bug.cgi?id=50235

The classes WebKit2PlatformTouchPoint and WebKit2PlatformTouchEvent
misses the conversion of TouchCancel events and points.

This patch add the missing enums when converting from a WebTouchEvent
to a PlatformTouchEvent.

Testing is already covered by fast/events/touch/send-oncancel-event.html

• Shared/WebEventConversion.cpp: (WebKit::WebKit2PlatformTouchPoint::WebKit2PlatformTouchPoint): (WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebEventConversion.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-14  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        WebKit 2 does not send touch cancel events correctly between processes
+        https://bugs.webkit.org/show_bug.cgi?id=50235
+
+        The classes WebKit2PlatformTouchPoint and WebKit2PlatformTouchEvent
+        misses the conversion of TouchCancel events and points.
+
+        This patch add the missing enums when converting from a WebTouchEvent
+        to a PlatformTouchEvent.
+
+        Testing is already covered by fast/events/touch/send-oncancel-event.html
+
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformTouchPoint::WebKit2PlatformTouchPoint):
+        (WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):
+
 2010-12-14  Zalan Bujtas  <zbujtas@gmail.com>
 

trunk/WebKit2/Shared/WebEventConversion.cpp

@@ -180 +180 @@
             m_state = PlatformTouchPoint::TouchStationary;
             break;
+        case WebPlatformTouchPoint::TouchCancelled:
+            m_state = PlatformTouchPoint::TouchCancelled;
+            break;
         default:
             ASSERT_NOT_REACHED();
@@ -203 +206 @@
             m_type = WebCore::TouchEnd; 
             break;
+        case WebEvent::TouchCancel:
+            m_type = WebCore::TouchCancel;
+            break;
         default:
             ASSERT_NOT_REACHED();