[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 2d05046722fbda8d3c6b3d3b6a90765cfc3b3621
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 12:10:45 2010 +0000

    2010-12-14  Benjamin Poulain  <benjamin.poulain at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 46ff247..b6d1967 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-14  Benjamin Poulain  <benjamin.poulain at 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 at gmail.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/Shared/WebEventConversion.cpp b/WebKit2/Shared/WebEventConversion.cpp
index 04aa6e4..54d4b4c 100644
--- a/WebKit2/Shared/WebEventConversion.cpp
+++ b/WebKit2/Shared/WebEventConversion.cpp
@@ -179,6 +179,9 @@ public:
         case WebPlatformTouchPoint::TouchStationary:
             m_state = PlatformTouchPoint::TouchStationary;
             break;
+        case WebPlatformTouchPoint::TouchCancelled:
+            m_state = PlatformTouchPoint::TouchCancelled;
+            break;
         default:
             ASSERT_NOT_REACHED();
         }
@@ -202,6 +205,9 @@ public:
         case WebEvent::TouchEnd: 
             m_type = WebCore::TouchEnd; 
             break;
+        case WebEvent::TouchCancel:
+            m_type = WebCore::TouchCancel;
+            break;
         default:
             ASSERT_NOT_REACHED();
         }

-- 
WebKit Debian packaging