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

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0e4d5e10e61f123bd5c8874512315251e8d1ce02
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 22:21:52 2010 +0000

    2010-07-19  Ojan Vafai  <ojan at chromium.org>
    
            Unreviewed.
            [chromium] Update test expectations after r63681.
            Add new expected results for the clearly correct cases after r63684.
    
            * platform/chromium-mac/media/video-load-networkState-expected.txt:
            * platform/chromium-mac/media/video-src-change-expected.txt:
            * platform/chromium-win/media/video-load-networkState-expected.txt:
            * platform/chromium-win/media/video-src-change-expected.txt:
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63692 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 445d153..a7f1ea5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-19  Ojan Vafai  <ojan at chromium.org>
+
+        Unreviewed.
+        [chromium] Update test expectations after r63681.
+        Add new expected results for the clearly correct cases after r63684.
+
+        * platform/chromium-mac/media/video-load-networkState-expected.txt:
+        * platform/chromium-mac/media/video-src-change-expected.txt:
+        * platform/chromium-win/media/video-load-networkState-expected.txt:
+        * platform/chromium-win/media/video-src-change-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
 2010-07-19  Eric Carlson  <eric.carlson at apple.com>
 
         Unreviewed, build fix.
diff --git a/LayoutTests/platform/chromium-mac/media/video-load-networkState-expected.txt b/LayoutTests/platform/chromium-mac/media/video-load-networkState-expected.txt
index f1cc406..2b73f34 100644
--- a/LayoutTests/platform/chromium-mac/media/video-load-networkState-expected.txt
+++ b/LayoutTests/platform/chromium-mac/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.ogv')
 EVENT(loadstart)
@@ -12,6 +12,5 @@ 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/platform/chromium-mac/media/video-src-change-expected.txt b/LayoutTests/platform/chromium-mac/media/video-src-change-expected.txt
index 9d95e6d..da18b53 100644
--- a/LayoutTests/platform/chromium-mac/media/video-src-change-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-src-change-expected.txt
@@ -5,7 +5,7 @@
 
 EVENT(error)
 EXPECTED (relativeURL(video.currentSrc) == 'bogus') OK
-EXPECTED (video.networkState == '4') OK
+EXPECTED (video.networkState == '3') OK
 EXPECTED (video.error.code == '4') OK
 
 
diff --git a/LayoutTests/platform/chromium-win/media/video-load-networkState-expected.txt b/LayoutTests/platform/chromium-win/media/video-load-networkState-expected.txt
index f1cc406..2b73f34 100644
--- a/LayoutTests/platform/chromium-win/media/video-load-networkState-expected.txt
+++ b/LayoutTests/platform/chromium-win/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.ogv')
 EVENT(loadstart)
@@ -12,6 +12,5 @@ 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/platform/chromium-win/media/video-src-change-expected.txt b/LayoutTests/platform/chromium-win/media/video-src-change-expected.txt
index 9d95e6d..da18b53 100644
--- a/LayoutTests/platform/chromium-win/media/video-src-change-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/video-src-change-expected.txt
@@ -5,7 +5,7 @@
 
 EVENT(error)
 EXPECTED (relativeURL(video.currentSrc) == 'bogus') OK
-EXPECTED (video.networkState == '4') OK
+EXPECTED (video.networkState == '3') OK
 EXPECTED (video.error.code == '4') OK
 
 
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index e2d6568..be879ae 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3122,3 +3122,6 @@ BUGWK20011 : printing/setPrinting.html = FAIL
 BUG49343 : fast/js/reserved-words-as-property.html = TEXT
 
 BUG42486 MAC DEBUG : svg/filters/filter-empty-g.svg = CRASH
+
+BUG42598 : http/tests/misc/401-alternative-content.php = TEXT
+BUG42598 : http/tests/xmlhttprequest/failed-auth.html = TEXT

-- 
WebKit Debian packaging