[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

Thu Feb 4 21:21:47 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit c3ae150ea528adfa6b2926d6474d2657a5b83674
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 17:22:49 2010 +0000

    2010-01-20  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Darin Adler.
    
            [Gtk] media/video-play-pause-exception.html is flacky
            https://bugs.webkit.org/show_bug.cgi?id=33900
    
            Refactored the test to use the pause event instead of a timer.
            * media/video-play-pause-exception.html:
            * platform/gtk/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index acb677d..27e2e0f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-20  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Darin Adler.
+
+        [Gtk] media/video-play-pause-exception.html is flacky
+        https://bugs.webkit.org/show_bug.cgi?id=33900
+
+        Refactored the test to use the pause event instead of a timer.
+        * media/video-play-pause-exception.html:
+        * platform/gtk/Skipped:
+
 2010-01-20  Ben Murdoch  <benm at google.com>
 
         Reviewed by Simon Hausmann.
diff --git a/LayoutTests/media/video-play-pause-exception.html b/LayoutTests/media/video-play-pause-exception.html
index f2c77ab..de62401 100644
--- a/LayoutTests/media/video-play-pause-exception.html
+++ b/LayoutTests/media/video-play-pause-exception.html
@@ -1,4 +1,5 @@
-
+<html>
+<body>
 <video controls></video>
 
 <p>Video has no src. Test that the playing event is not dispatched.</p>
@@ -9,18 +10,19 @@
 
     waitForEvent("loadstart");
     waitForEvent("timeupdate");
-    waitForEvent("pause");
     waitForEvent("waiting");
 
-    run("video.play()");
-    run("video.pause()");
-
-    function someTimeLater()
+    function onpause()
     {
         testExpected("video.networkState", HTMLMediaElement.NETWORK_EMPTY);
         endTest();
         consoleWrite("");
      }
-    
-    setTimeout(someTimeLater, 400) 
+
+    waitForEvent("pause", onpause);
+
+    run("video.play()");
+    run("video.pause()");
 </script>
+</body>
+</html>
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 00f825e..6c03a6b 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5569,7 +5569,6 @@ fast/css/opacity-float.html
 # Media tests that keep failing on the bot
 media/video-currentTime-set.html
 media/video-play-pause-events.html
-media/video-play-pause-exception.html
 
 # New events failing; see https://bugs.webkit.org/show_bug.cgi?id=28823
 fast/events/pageshow-pagehide-on-back-cached.html

-- 
WebKit Debian packaging

