[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ffe75561ef99b8c7da72605581275d4ab08fc4e6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 14:37:19 2010 +0000

    2010-01-12  Petri Latvala  <petri.latvala at nomovok.com>
    
            Reviewed by Antti Koivisto.
    
            fast/events/touch-coords-in-zoom-and-scroll-pretty-diff.html failed on buildbot
            https://bugs.webkit.org/show_bug.cgi?id=33465
    
            A touchmove event is not dispatched if none of the touch points actually moved.
            Changed the test to use touchstart instead.
    
            * fast/events/touch/touch-coords-in-zoom-and-scroll.html:
            * platform/qt/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53140 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2aab557..aedc4db 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-12  Petri Latvala  <petri.latvala at nomovok.com>
+
+        Reviewed by Antti Koivisto.
+
+        fast/events/touch-coords-in-zoom-and-scroll-pretty-diff.html failed on buildbot
+        https://bugs.webkit.org/show_bug.cgi?id=33465
+
+        A touchmove event is not dispatched if none of the touch points actually moved.
+        Changed the test to use touchstart instead.
+
+        * fast/events/touch/touch-coords-in-zoom-and-scroll.html:
+        * platform/qt/Skipped:
+
 2010-01-12  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html b/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
index cbdc624..00cd162 100644
--- a/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
+++ b/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
@@ -15,10 +15,12 @@
 <script>
     var event;
 
-    function sendTouchMove()
+    function sendTouchStart(x, y)
     {
         if (window.eventSender) {
-            eventSender.touchMove();
+            eventSender.clearTouchPoints();
+            eventSender.addTouchPoint(x, y);
+            eventSender.touchStart();
         }
     }
 
@@ -57,15 +59,10 @@
         shouldBe("event.touches[0].pageY", "100");
     }
 
-    window.addEventListener("touchmove", base, false);
-
-    if (window.eventSender) {
-        eventSender.addTouchPoint(100, 100);
-        eventSender.touchStart();
-    }
+    window.addEventListener("touchstart", base, false);
     
-    sendTouchMove();
-    window.removeEventListener("touchmove", base, false);
+    sendTouchStart(100, 100);
+    window.removeEventListener("touchstart", base, false);
     
     // Just zoomed.
     function justZoomed(e)
@@ -77,11 +74,11 @@
         shouldBe("event.touches[0].pageX", "83");
         shouldBe("event.touches[0].pageY", "83");
     }
-    window.addEventListener("touchmove", justZoomed, false);
+    window.addEventListener("touchstart", justZoomed, false);
     zoomPageIn();
-    sendTouchMove();
+    sendTouchStart(100, 100);
     zoomPageOut();
-    window.removeEventListener("touchmove", justZoomed, false);
+    window.removeEventListener("touchstart", justZoomed, false);
 
     // Just scrolled.
     function justScrolled(e)
@@ -93,11 +90,11 @@
         shouldBe("event.touches[0].pageX", "150");
         shouldBe("event.touches[0].pageY", "150");
     }
-    window.addEventListener("touchmove", justScrolled, false);
+    window.addEventListener("touchstart", justScrolled, false);
     scrollPage(50, 50);
-    sendTouchMove();
+    sendTouchStart(100, 100);
     scrollPage(0, 0);
-    window.removeEventListener("touchmove", justScrolled, false);
+    window.removeEventListener("touchstart", justScrolled, false);
 
     // Zoomed and scrolled.
     function zoomedAndScrolled(e)
@@ -109,13 +106,13 @@
         shouldBe("event.touches[0].pageX", "133");
         shouldBe("event.touches[0].pageY", "133");
     }
-    window.addEventListener("touchmove", zoomedAndScrolled, false);
+    window.addEventListener("touchstart", zoomedAndScrolled, false);
     zoomPageIn();
     scrollPage(50, 50);
-    sendTouchMove();
+    sendTouchStart(100, 100);
     zoomPageOut();
     scrollPage(0, 0);
-    window.removeEventListener("touchmove", zoomedAndScrolled, false);
+    window.removeEventListener("touchstart", zoomedAndScrolled, false);
 
     if (window.eventSender) {
         eventSender.touchEnd();
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 4aeeb23..5cd0453 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5089,6 +5089,3 @@ fast/forms/slider-thumb-shared-style.html
 fast/forms/slider-thumb-stylability.html
 fast/forms/slider-zoomed.html
 fast/forms/slider-mouse-events.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=33465
-fast/events/touch/touch-coords-in-zoom-and-scroll.html

-- 
WebKit Debian packaging