[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
kov at webkit.org
kov at webkit.org
Tue Jan 5 23:43:43 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 7091a7c45880729647ac1e9d4938dfa2edc72035
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 7 19:26:41 2009 +0000
Unreviewed. Landing files I forgot to add to my working copy before
committing r51734.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51784 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ab6ad91..1af1740 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-07 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Unreviewed. Landing files I forgot to add to my working copy
+ before committing r51734.
+
+ * media/media-can-play-ogg-expected.txt: Added.
+ * media/media-can-play-ogg.html: Added.
+
2009-12-07 Alexey Proskuryakov <ap at apple.com>
Don't skip websocket/tests/url-with-credential.html, it's one of earlier tests that is
diff --git a/LayoutTests/media/media-can-play-ogg-expected.txt b/LayoutTests/media/media-can-play-ogg-expected.txt
new file mode 100644
index 0000000..18ff058
--- /dev/null
+++ b/LayoutTests/media/media-can-play-ogg-expected.txt
@@ -0,0 +1,6 @@
+Test HTMLMediaElement canPlayType() method for ogg media containers.
+
+EXPECTED (video.canPlayType('audio/ogg') == 'maybe') OK
+EXPECTED (video.canPlayType('video/ogg') == 'maybe') OK
+END OF TEST
+
diff --git a/LayoutTests/media/media-can-play-ogg.html b/LayoutTests/media/media-can-play-ogg.html
new file mode 100644
index 0000000..29fda55
--- /dev/null
+++ b/LayoutTests/media/media-can-play-ogg.html
@@ -0,0 +1,23 @@
+<html>
+ <head>
+ <style>
+ video { background-color: yellow; width: 320px; height: 240px;}
+ </style>
+ </head>
+ <body>
+
+ <video controls ></video>
+
+ <p>Test HTMLMediaElement <em>canPlayType()</em> method for ogg media containers.</p>
+
+ <script src=video-test.js></script>
+ <script>
+ video = mediaElement = document.getElementsByTagName('video')[0];
+
+ testExpected("video.canPlayType('audio/ogg')", "maybe");
+ testExpected("video.canPlayType('video/ogg')", "maybe");
+
+ endTest();
+ </script>
+ </body>
+</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list