[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 56b44d53c48f5316f8f528e4fd3c555f14652c69
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 02:15:09 2010 +0000

    2010-12-08  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Andreas Kling.
    
            WebTouchEvent::isTouchEventType() does not take into account the type TouchCancel
            https://bugs.webkit.org/show_bug.cgi?id=50680
    
            Add the missing type check to WebTouchEvent::isTouchEventType().
    
            * Shared/WebTouchEvent.cpp:
            (WebKit::WebTouchEvent::isTouchEventType):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d526a4c..7da350c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-08  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        WebTouchEvent::isTouchEventType() does not take into account the type TouchCancel
+        https://bugs.webkit.org/show_bug.cgi?id=50680
+
+        Add the missing type check to WebTouchEvent::isTouchEventType().
+
+        * Shared/WebTouchEvent.cpp:
+        (WebKit::WebTouchEvent::isTouchEventType):
+
 2010-12-08  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/Shared/WebTouchEvent.cpp b/WebKit2/Shared/WebTouchEvent.cpp
index 6421243..f42f48c 100644
--- a/WebKit2/Shared/WebTouchEvent.cpp
+++ b/WebKit2/Shared/WebTouchEvent.cpp
@@ -60,7 +60,7 @@ bool WebTouchEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebTouchEvent& t)
 
 bool WebTouchEvent::isTouchEventType(Type type)
 {
-    return type == TouchStart || type == TouchMove || type == TouchEnd;
+    return type == TouchStart || type == TouchMove || type == TouchEnd || type == TouchCancel;
 }
     
 } // namespace WebKit

-- 
WebKit Debian packaging