[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 21d7be4c09acfba4e4313196af6b190f918d98fb
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 01:42:37 2010 +0000

    2010-02-16  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Nikolas Zimmermann.
    
            Make this test more robust to slow-loading media.
    
            * media/video-load-networkState.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54852 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f996d39..2b0dcb5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -9,6 +9,14 @@
 
 2010-02-16  Simon Fraser  <simon.fraser at apple.com>
 
+        Reviewed by Nikolas Zimmermann.
+
+        Make this test more robust to slow-loading media.
+
+        * media/video-load-networkState.html:
+
+2010-02-16  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by Dan Bernstein.
 
         https://bugs.webkit.org/show_bug.cgi?id=34999
diff --git a/LayoutTests/media/video-load-networkState.html b/LayoutTests/media/video-load-networkState.html
index a4ab51c..afaf390 100644
--- a/LayoutTests/media/video-load-networkState.html
+++ b/LayoutTests/media/video-load-networkState.html
@@ -26,9 +26,14 @@
         waitForEventAndFail("playing");
         waitForEvent("canplaythrough", function () { testNetworkState(HTMLMediaElement.NETWORK_LOADING, true, '>=' ); } );
     
-        function someTimeLater()
+        function waitUntilNotLoading()
         {
-            testNetworkState(HTMLMediaElement.NETWORK_NO_SOURCE );
+            if (video.networkState == HTMLMediaElement.NETWORK_LOADING) {
+                setTimeout(waitUntilNotLoading, 100);
+                return;
+            }
+            
+            testNetworkState(HTMLMediaElement.NETWORK_NO_SOURCE);
             consoleWrite("");
 
             // now set a valid url
@@ -40,8 +45,8 @@
         consoleWrite("");
         testNetworkState(HTMLMediaElement.NETWORK_EMPTY);
         run("video.src = 'bogus/movie.mpg'");
-        setTimeout(someTimeLater, 400) 
-    
+        
+        setTimeout(waitUntilNotLoading, 100);
     </script>
 
 </body>

-- 
WebKit Debian packaging