[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
jer.noble at apple.com
jer.noble at apple.com
Sun Feb 20 23:50:49 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 250c1b315f9b77aca97399adb4448e1f0a82edff
Author: jer.noble at apple.com <jer.noble at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 25 20:52:02 2011 +0000
Unreviewed build fix: rollback untintentional changes in media expected results.
* media/video-source-moved-expected.txt:
* media/video-source-none-supported-expected.txt:
* LayoutTests/platform/win/media/audio-data-url-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76628 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f53577b..7d26422 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-25 Jer Noble <jer.noble at apple.com>
+
+ Unreviewed build fix: rollback untintentional changes in media expected results.
+
+ * media/video-source-moved-expected.txt:
+ * media/video-source-none-supported-expected.txt:
+ * LayoutTests/platform/win/media/audio-data-url-expected.txt:
+
2011-01-25 Tony Chang <tony at chromium.org>
Unreviewed, mark inspector/debugger-scripts.html as failing on chromium linux.
diff --git a/LayoutTests/media/video-source-moved-expected.txt b/LayoutTests/media/video-source-moved-expected.txt
index e3588b1..62f77cf 100644
--- a/LayoutTests/media/video-source-moved-expected.txt
+++ b/LayoutTests/media/video-source-moved-expected.txt
@@ -1,5 +1,34 @@
Test to make sure a <source> moved after the media element begins processing is handled correctly.
-not found in <source> list FAIL
+Moving previous <source> element to end of list, it should be processed again.
+EXPECTED ([object HTMLSourceElement] != 'null') OK
+<source> moved was processed a second time. OK
+
+Moving current <source> element, it should be processed again.
+EXPECTED ([object HTMLSourceElement] != 'null') OK
+<source> moved was processed a second time. OK
+
+Moving next <source> element, it should be processed again.
+EXPECTED ([object HTMLSourceElement] != 'null') OK
+<source> moved was processed a second time. OK
+
+Moving current <source> element to beginning of list, it should not be processed again.
+EXPECTED ([object HTMLSourceElement] != 'null') OK
+<source> moved was not processed OK
+
+Moving next <source> element to beginning of list, it should never processed.
+EXPECTED ([object HTMLSourceElement] != 'null') OK
+<source> moved was not processed OK
+
+<span> inserted after current <source> element before it is removed, processing should proceed normally.
+EXPECTED ([object HTMLSourceElement] != 'null') OK
+<source> moved was not processed OK
+
+<span> inserted after next <source> element before it is removed, processing should proceed normally.
+EXPECTED ([object HTMLSourceElement] != 'null') OK
+<source> moved was not processed OK
+
+PASS
+
END OF TEST
diff --git a/LayoutTests/media/video-source-none-supported-expected.txt b/LayoutTests/media/video-source-none-supported-expected.txt
index 17ebaf2..9ba009c 100644
--- a/LayoutTests/media/video-source-none-supported-expected.txt
+++ b/LayoutTests/media/video-source-none-supported-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 114: TypeError: 'null' is not an object (evaluating 'current.previousSibling')
1. Test that no usable <source> element leaves the media element with networkState == NETWORK_NO_SOURCE
++ ERROR, src = test.mp4, type = "audio/x-chicken-face"
diff --git a/LayoutTests/platform/win/media/audio-data-url-expected.txt b/LayoutTests/platform/win/media/audio-data-url-expected.txt
index e2c2076..07a7d60 100644
--- a/LayoutTests/platform/win/media/audio-data-url-expected.txt
+++ b/LayoutTests/platform/win/media/audio-data-url-expected.txt
@@ -1,11 +1,5 @@
+FAIL: Timed out waiting for notifyDone to be called
Test that audio element can use a data: url
EVENT(loadstart)
-EVENT(durationchange)
-EVENT(loadedmetadata)
-EVENT(loadeddata)
-EVENT(canplay)
-EVENT(canplaythrough)
-EXPECTED (mediaElement.duration.toFixed(2) == '2.94') OK
-END OF TEST
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list