[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 beee2a0e62b1c343d15f6f6f7be2c6efbf5de810
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 20:53:54 2010 +0000

    2010-07-19  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed, build fix.
    
            Update tests/results missed in r63684.
    
            * media/video-error-does-not-exist-expected.txt:
            * media/video-load-networkState-expected.txt:
            * media/video-load-networkState.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63686 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c6be32f..ce75d6f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-19  Eric Carlson  <eric.carlson at apple.com>
+
+        Unreviewed, build fix.
+
+        Update tests/results missed in r63684.
+
+        * media/video-error-does-not-exist-expected.txt:
+        * media/video-load-networkState-expected.txt:
+        * media/video-load-networkState.html:
+
 2010-07-19  Alexey Proskuryakov  <ap at apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=42586
diff --git a/LayoutTests/media/video-error-does-not-exist-expected.txt b/LayoutTests/media/video-error-does-not-exist-expected.txt
index 6c471fa..78a53ff 100644
--- a/LayoutTests/media/video-error-does-not-exist-expected.txt
+++ b/LayoutTests/media/video-error-does-not-exist-expected.txt
@@ -6,7 +6,7 @@ EXPECTED (video.error == 'null') OK
 EVENT(error)
 EXPECTED (video.error != 'null') OK
 EXPECTED (video.error.code == '4') OK
-EXPECTED (video.networkState == '4') OK
+EXPECTED (video.networkState == '3') OK
 EXPECTED (isNaN(video.duration) == 'true') OK
 EXPECTED (video.currentTime == '0') OK
 EXPECTED (video.buffered.length == '0') OK
diff --git a/LayoutTests/media/video-load-networkState-expected.txt b/LayoutTests/media/video-load-networkState-expected.txt
index 189ad1b..ddcb209 100644
--- a/LayoutTests/media/video-load-networkState-expected.txt
+++ b/LayoutTests/media/video-load-networkState-expected.txt
@@ -4,7 +4,7 @@ Test that setting src to an invalid url triggers load(), which sets networkState
 EXPECTED (video.networkState == '0') OK
 RUN(video.src = 'bogus/movie.mpg')
 EVENT(loadstart)
-EXPECTED (video.networkState == '4') OK
+EXPECTED (video.networkState == '3') OK
 
 RUN(video.src = 'content/test.mp4')
 EVENT(loadstart)
@@ -12,6 +12,6 @@ EVENT(loadedmetadata)
 EVENT(loadeddata)
 EVENT(canplay)
 EVENT(canplaythrough)
-EXPECTED (video.networkState >= '2') OK
+EXPECTED (video.networkState >= '1') OK
 END OF TEST
 
diff --git a/LayoutTests/media/video-load-networkState.html b/LayoutTests/media/video-load-networkState.html
index afaf390..50cd394 100644
--- a/LayoutTests/media/video-load-networkState.html
+++ b/LayoutTests/media/video-load-networkState.html
@@ -24,7 +24,7 @@
         waitForEvent("canplay");
         waitForEventAndFail("play");
         waitForEventAndFail("playing");
-        waitForEvent("canplaythrough", function () { testNetworkState(HTMLMediaElement.NETWORK_LOADING, true, '>=' ); } );
+        waitForEvent("canplaythrough", function () { testNetworkState(HTMLMediaElement.NETWORK_IDLE, true, '>=' ); } );
     
         function waitUntilNotLoading()
         {

-- 
WebKit Debian packaging