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

[eric.carlson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 279c46fb9cc89fb9ac84f612ffb73b27cbd8d4e2
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 22:36:10 2010 +0000

    2010-10-29  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Adam Roben.
    
            Results for media test controls-drag-timebar.html are needlessly platform specific
            https://bugs.webkit.org/show_bug.cgi?id=48662
    
            * media/controls-drag-timebar-expected.txt:
            * media/controls-drag-timebar.html: Remove some of the logging to avoid timing differences
            on slower machines.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70940 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 94b9517..354c590 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-29  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Results for media test controls-drag-timebar.html are needlessly platform specific
+        https://bugs.webkit.org/show_bug.cgi?id=48662
+
+        * media/controls-drag-timebar-expected.txt:
+        * media/controls-drag-timebar.html: Remove some of the logging to avoid timing differences
+        on slower machines.
+
 2010-10-29  Adam Roben  <aroben at apple.com>
 
         Update test results for the presence of HTMLMeterElement
diff --git a/LayoutTests/media/controls-drag-timebar-expected.txt b/LayoutTests/media/controls-drag-timebar-expected.txt
index ba4b7b4..9362ae0 100644
--- a/LayoutTests/media/controls-drag-timebar-expected.txt
+++ b/LayoutTests/media/controls-drag-timebar-expected.txt
@@ -1,33 +1,11 @@
 Test that dragging the timebar thumb causes seeks.
 
 EVENT(canplaythrough)
-EVENT(seeking)
 EVENT(seeked)
-EXPECTED (previousTime != 'video.currentTime') OK
-
-Dragging mouse 12 pixels right
-EVENT(seeking)
 EVENT(seeked)
-EXPECTED (previousTime != 'video.currentTime') OK
-
-Dragging mouse 14 pixels left
-EVENT(seeking)
 EVENT(seeked)
-EXPECTED (previousTime != 'video.currentTime') OK
-
-Dragging mouse 16 pixels right
-EVENT(seeking)
 EVENT(seeked)
-EXPECTED (previousTime != 'video.currentTime') OK
-
-Dragging mouse 18 pixels left
-EVENT(seeking)
 EVENT(seeked)
-EXPECTED (previousTime != 'video.currentTime') OK
-
-Dragging mouse 20 pixels right
-EVENT(seeking)
 EVENT(seeked)
-EXPECTED (previousTime != 'video.currentTime') OK
 END OF TEST
 
diff --git a/LayoutTests/media/controls-drag-timebar.html b/LayoutTests/media/controls-drag-timebar.html
index 01963fa..ea2416a 100644
--- a/LayoutTests/media/controls-drag-timebar.html
+++ b/LayoutTests/media/controls-drag-timebar.html
@@ -7,7 +7,6 @@
         <script>
             var x;
             var y;
-            var previousTime;
             var seekCount;
             var moveCount;
 
@@ -16,7 +15,6 @@
 
             function test()
             {
-                previousTime = video.currentTime;
                 seekCount = 0;
                 moveCount = 0;
 
@@ -40,24 +38,16 @@
                 ++moveCount;
 
                 var delta = (10 + moveCount * 2) * (moveCount % 2 ? 1 : -1);
-                consoleWrite("");
-                consoleWrite("Dragging mouse " + Math.abs(delta) + " pixels " + (delta > 0 ? "right" : "left"));
 
                 if (window.eventSender) {
                     x += delta;
                     eventSender.mouseMoveTo(x, y);
-                } else if (moveCount > 6 )
-                    endTest();  // to allow testing without DRT
-
-                previousTime = video.currentTime;
-                window.setTimeout("move()", 100);
+                    window.setTimeout("move()", 100);
+                }
             }
 
             function seeked()
             {
-                // Don't use "testExpected()" so we won't log the times as the floating point result will differ with different engines.
-                reportExpected(previousTime != video.currentTime, "previousTime", "!=", "video.currentTime", previousTime);
-
                 if (++seekCount == 6) {
                     if (window.eventSender)
                         eventSender.mouseUp();
@@ -69,7 +59,6 @@
             {
                 findMediaElement();
                 waitForEvent('canplaythrough', test);
-                waitForEvent('seeking');
                 waitForEvent('seeked', seeked);
                 video.src = findMediaFile("video", "content/test");
             }    

-- 
WebKit Debian packaging