Diff
Modified: trunk/LayoutTests/ChangeLog (115797 => 115798)
--- trunk/LayoutTests/ChangeLog 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/ChangeLog 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,3 +1,27 @@
+2012-04-27 Andrew Scherkus <[email protected]>
+
+ Clean up media canPlayType() tests and add a test for WebM.
+ https://bugs.webkit.org/show_bug.cgi?id=85116
+
+ Reviewed by Eric Carlson.
+
+ * media/media-can-play-flac-audio-expected.txt:
+ * media/media-can-play-flac-audio.html:
+ * media/media-can-play-mpeg-audio-expected.txt:
+ * media/media-can-play-mpeg-audio.html:
+ * media/media-can-play-mpeg4-video.html:
+ * media/media-can-play-octet-stream-expected.txt:
+ * media/media-can-play-octet-stream.html:
+ * media/media-can-play-ogg-expected.txt:
+ * media/media-can-play-ogg.html:
+ * media/media-can-play-type-expected.txt: Renamed from LayoutTests/media/video-can-play-type-expected.txt.
+ * media/media-can-play-type.html: Added.
+ * media/media-can-play-wav-audio-expected.txt:
+ * media/media-can-play-wav-audio.html:
+ * media/media-can-play-webm-expected.txt: Added.
+ * media/media-can-play-webm.html: Added.
+ * media/video-can-play-type.html: Removed.
+
2012-05-01 Eric Seidel <[email protected]>
Add <iframe seamless> navigation code (and pass all the navigation tests)
Modified: trunk/LayoutTests/media/media-can-play-flac-audio-expected.txt (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-flac-audio-expected.txt 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-flac-audio-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,6 +1,8 @@
Test HTMLMediaElement canPlayType() method with multiple .flac MIME types.
+These tests may be expected to fail if the WebKit port does not support the format.
+
+EXPECTED (audio.canPlayType('audio/x-flac') == 'maybe') OK
EXPECTED (audio.canPlayType('audio/flac') == 'maybe') OK
-EXPECTED (audio.canPlayType('audio/x-flac') == 'maybe') OK
END OF TEST
Modified: trunk/LayoutTests/media/media-can-play-flac-audio.html (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-flac-audio.html 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-flac-audio.html 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,26 +1,22 @@
-<!doctype html>
+<!DOCTYPE html>
<html>
<head>
- <script src=""
+ <script src=""
<script>
function start()
{
audio = document.getElementsByTagName('audio')[0];
- // FLAC encoded audio in a native flac container
- testExpected("audio.canPlayType('audio/flac')", "maybe");
testExpected("audio.canPlayType('audio/x-flac')", "maybe");
+ testExpected("audio.canPlayType('audio/flac')", "maybe");
endTest();
}
</script>
-
</head>
<body _onload_="start()">
-
- <audio controls ></audio>
-
+ <audio controls></audio>
<p>Test HTMLMediaElement <em>canPlayType()</em> method with multiple .flac MIME types.</p>
-
+ <p>These tests may be expected to fail if the WebKit port does not support the format.</p>
</body>
</html>
Modified: trunk/LayoutTests/media/media-can-play-mpeg-audio-expected.txt (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-mpeg-audio-expected.txt 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-mpeg-audio-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,9 +1,12 @@
-Test HTMLMediaElement canPlayType() method with multiple mp3 MIME types.
+Test HTMLMediaElement canPlayType() method with multiple audio mpeg MIME types.
-EXPECTED (video.canPlayType('audio/x-mpeg') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/x-mp3') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/mp3') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/mp4') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/aac') == 'maybe') OK
+These tests may be expected to fail if the WebKit port does not support the format.
+
+EXPECTED (audio.canPlayType('audio/x-mpeg') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/x-mp3') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/mp3') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/mpeg') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/mp4') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/aac') == 'maybe') OK
END OF TEST
Modified: trunk/LayoutTests/media/media-can-play-mpeg-audio.html (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-mpeg-audio.html 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-mpeg-audio.html 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,31 +1,27 @@
+<!DOCTYPE html>
<html>
<head>
- <style>
- video { background-color: yellow; width: 320px; height: 240px;}
- </style>
<script src=""
<script>
function start()
{
- video = mediaElement = document.getElementsByTagName('video')[0];
+ audio = document.getElementsByTagName('audio')[0];
- testExpected("video.canPlayType('audio/x-mpeg')", "maybe");
- testExpected("video.canPlayType('audio/x-mp3')", "maybe");
- testExpected("video.canPlayType('audio/mp3')", "maybe");
+ testExpected("audio.canPlayType('audio/x-mpeg')", "maybe");
+ testExpected("audio.canPlayType('audio/x-mp3')", "maybe");
+ testExpected("audio.canPlayType('audio/mp3')", "maybe");
+ testExpected("audio.canPlayType('audio/mpeg')", "maybe");
- testExpected("video.canPlayType('audio/mp4')", "maybe");
- testExpected("video.canPlayType('audio/aac')", "maybe");
+ testExpected("audio.canPlayType('audio/mp4')", "maybe");
+ testExpected("audio.canPlayType('audio/aac')", "maybe");
endTest();
}
</script>
-
</head>
<body _onload_="start()">
-
- <video controls ></video>
-
- <p>Test HTMLMediaElement <em>canPlayType()</em> method with multiple mp3 MIME types.</p>
-
+ <audio controls></audio>
+ <p>Test HTMLMediaElement <em>canPlayType()</em> method with multiple audio mpeg MIME types.</p>
+ <p>These tests may be expected to fail if the WebKit port does not support the format.</p>
</body>
</html>
Modified: trunk/LayoutTests/media/media-can-play-mpeg4-video-expected.txt (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-mpeg4-video-expected.txt 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-mpeg4-video-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,6 +1,10 @@
Test HTMLMediaElement canPlayType() method with multiple video mpeg4 MIME types.
+These tests may be expected to fail if the WebKit port does not support the format.
+
EXPECTED (video.canPlayType('video/x-m4v') == 'maybe') OK
EXPECTED (video.canPlayType('video/mp4') == 'maybe') OK
+EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"') == 'probably') OK
+EXPECTED (video.canPlayType(' Video/MP4 ; CODECS="mp4v.20.8, mp4a.40.2"') == 'probably') OK
END OF TEST
Modified: trunk/LayoutTests/media/media-can-play-mpeg4-video.html (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-mpeg4-video.html 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-mpeg4-video.html 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,28 +1,24 @@
+<!DOCTYPE html>
<html>
<head>
- <style>
- video { background-color: yellow; width: 320px; height: 240px;}
- </style>
- <script src=""
+ <script src=""
<script>
function start()
{
- video = mediaElement = document.getElementsByTagName('video')[0];
+ video = document.getElementsByTagName('video')[0];
testExpected("video.canPlayType('video/x-m4v')", "maybe");
testExpected("video.canPlayType('video/mp4')", "maybe");
+ testExpected("video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"')", "probably");
+ testExpected("video.canPlayType(' Video/MP4 ; CODECS=\"mp4v.20.8, mp4a.40.2\"')", "probably");
endTest();
}
</script>
-
</head>
<body _onload_="start()">
-
- <video controls ></video>
-
- <p>Test HTMLMediaElement <em>canPlayType()</em> method with
- multiple video mpeg4 MIME types.</p>
-
+ <video controls></video>
+ <p>Test HTMLMediaElement <em>canPlayType()</em> method with multiple video mpeg4 MIME types.</p>
+ <p>These tests may be expected to fail if the WebKit port does not support the format.</p>
</body>
</html>
Modified: trunk/LayoutTests/media/media-can-play-octet-stream-expected.txt (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-octet-stream-expected.txt 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-octet-stream-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,5 +1,7 @@
Test HTMLMediaElement canPlayType() method with "application/octet-stream".
+These tests should always pass as no WebKit port should support "application/octet-stream".
+
++ Test with <video> element.
EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == '') OK
EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=theora') == '') OK
Modified: trunk/LayoutTests/media/media-can-play-octet-stream.html (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-octet-stream.html 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-octet-stream.html 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,11 +1,7 @@
<!DOCTYPE html>
-
<html>
<head>
- <style>
- video { background-color: yellow; width: 320px; height: 240px;}
- </style>
- <script src=""
+ <script src=""
<script>
function test()
{
@@ -27,13 +23,10 @@
endTest();
}
</script>
-
</head>
<body _onload_="start()">
-
- <video controls ></video>
-
+ <video controls></video>
<p>Test HTMLMediaElement <em>canPlayType()</em> method with "application/octet-stream".</p>
-
+ <p>These tests should always pass as no WebKit port should support "application/octet-stream".</p>
</body>
</html>
Modified: trunk/LayoutTests/media/media-can-play-ogg-expected.txt (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-ogg-expected.txt 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-ogg-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,6 +1,11 @@
Test HTMLMediaElement canPlayType() method for ogg media containers.
-EXPECTED (video.canPlayType('Audio/ogg') == 'maybe') OK
-EXPECTED (video.canPlayType('Video/ogg') == 'maybe') OK
+These tests may be expected to fail if the WebKit port does not support the format.
+
+EXPECTED (video.canPlayType('audio/ogg') == 'maybe') OK
+EXPECTED (video.canPlayType('video/ogg') == 'maybe') OK
+EXPECTED (video.canPlayType('audio/ogg; codecs=vorbis') == 'probably') OK
+EXPECTED (video.canPlayType('video/ogg; codecs=theora') == 'probably') OK
+EXPECTED (video.canPlayType('video/ogg; codecs=theora,vorbis') == 'probably') OK
END OF TEST
Modified: trunk/LayoutTests/media/media-can-play-ogg.html (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-ogg.html 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-ogg.html 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,23 +1,25 @@
+<!DOCTYPE html>
<html>
<head>
- <style>
- video { background-color: yellow; width: 320px; height: 240px;}
- </style>
- </head>
- <body>
+ <script src=""
+ <script>
+ function start() {
+ video = mediaElement = document.getElementsByTagName('video')[0];
- <video controls ></video>
+ testExpected("video.canPlayType('audio/ogg')", "maybe");
+ testExpected("video.canPlayType('video/ogg')", "maybe");
- <p>Test HTMLMediaElement <em>canPlayType()</em> method for ogg media containers.</p>
+ testExpected("video.canPlayType('audio/ogg; codecs=vorbis')", "probably");
+ testExpected("video.canPlayType('video/ogg; codecs=theora')", "probably");
+ testExpected("video.canPlayType('video/ogg; codecs=theora,vorbis')", "probably");
- <script src=""
- <script>
- video = mediaElement = document.getElementsByTagName('video')[0];
-
- testExpected("video.canPlayType('Audio/ogg')", "maybe");
- testExpected("video.canPlayType('Video/ogg')", "maybe");
-
- endTest();
+ endTest();
+ }
</script>
+ </head>
+ <body _onload_="start()">
+ <video controls></video>
+ <p>Test HTMLMediaElement <em>canPlayType()</em> method for ogg media containers.</p>
+ <p>These tests may be expected to fail if the WebKit port does not support the format.</p>
</body>
</html>
Copied: trunk/LayoutTests/media/media-can-play-type-expected.txt (from rev 115796, trunk/LayoutTests/media/video-can-play-type-expected.txt) (0 => 115798)
--- trunk/LayoutTests/media/media-can-play-type-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-can-play-type-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -0,0 +1,13 @@
+Test HTMLMediaElement canPlayType() method.
+
+EXPECTED (video.canPlayType() == '') OK
+EXPECTED (video.canPlayType('video/') == '') OK
+EXPECTED (video.canPlayType('video/blahblah') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs="blah, , blah"') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs=blah') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs="blah"') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs="badcontent') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs=badcontent"') == '') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs="badcontent"') == '') OK
+END OF TEST
+
Property changes: trunk/LayoutTests/media/media-can-play-type-expected.txt
Added: svn:eol-style
Added: trunk/LayoutTests/media/media-can-play-type.html (0 => 115798)
--- trunk/LayoutTests/media/media-can-play-type.html (rev 0)
+++ trunk/LayoutTests/media/media-can-play-type.html 2012-05-02 06:07:46 UTC (rev 115798)
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=""
+ <script>
+ function start() {
+ video = document.getElementsByTagName('video')[0];
+
+ testExpected("video.canPlayType()", "");
+ testExpected("video.canPlayType('video/')", "");
+ testExpected("video.canPlayType('video/blahblah')", "");
+ testExpected("video.canPlayType('video/blahblah; codecs=\"blah, , blah\"')", "");
+ testExpected("video.canPlayType('video/blahblah; codecs=blah')", "");
+ testExpected("video.canPlayType('video/blahblah; codecs=\"blah\"')", "");
+ testExpected("video.canPlayType('video/blahblah; codecs=\"badcontent')", "");
+ testExpected("video.canPlayType('video/blahblah; codecs=badcontent\"')", "");
+ testExpected("video.canPlayType('video/blahblah; codecs="badcontent"')", "");
+
+ endTest();
+ }
+ </script>
+ </head>
+ <body _onload_="start()">
+ <video controls></video>
+ <p>Test HTMLMediaElement <em>canPlayType()</em> method.</p>
+ </body>
+</html>
Property changes on: trunk/LayoutTests/media/media-can-play-type.html
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/LayoutTests/media/media-can-play-wav-audio-expected.txt (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-wav-audio-expected.txt 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-wav-audio-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,6 +1,10 @@
Test HTMLMediaElement canPlayType() method with multiple .wav MIME types.
+These tests may be expected to fail if the WebKit port does not support the format.
+
EXPECTED (audio.canPlayType('audio/wav') == 'maybe') OK
EXPECTED (audio.canPlayType('audio/x-wav') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/wav; codecs=1') == 'probably') OK
+EXPECTED (audio.canPlayType('audio/x-wav; codecs=1') == 'probably') OK
END OF TEST
Modified: trunk/LayoutTests/media/media-can-play-wav-audio.html (115797 => 115798)
--- trunk/LayoutTests/media/media-can-play-wav-audio.html 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/media-can-play-wav-audio.html 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
<html>
<head>
<script src=""
@@ -10,16 +10,17 @@
testExpected("audio.canPlayType('audio/wav')", "maybe");
testExpected("audio.canPlayType('audio/x-wav')", "maybe");
+ // WAV codec 1 is basic PCM, refer to http://tools.ietf.org/html/rfc2361
+ testExpected("audio.canPlayType('audio/wav; codecs=1')", "probably");
+ testExpected("audio.canPlayType('audio/x-wav; codecs=1')", "probably");
+
endTest();
}
</script>
-
</head>
<body _onload_="start()">
-
- <audio controls ></audio>
-
+ <audio controls></audio>
<p>Test HTMLMediaElement <em>canPlayType()</em> method with multiple .wav MIME types.</p>
-
+ <p>These tests may be expected to fail if the WebKit port does not support the format.</p>
</body>
</html>
Added: trunk/LayoutTests/media/media-can-play-webm-expected.txt (0 => 115798)
--- trunk/LayoutTests/media/media-can-play-webm-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-can-play-webm-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -0,0 +1,10 @@
+Test HTMLMediaElement canPlayType() method for webm media containers.
+
+These tests may be expected to fail if the WebKit port does not support the format.
+
+EXPECTED (video.canPlayType('audio/webm') == 'maybe') OK
+EXPECTED (video.canPlayType('video/webm') == 'maybe') OK
+EXPECTED (video.canPlayType('audio/webm; codecs=vorbis') == 'probably') OK
+EXPECTED (video.canPlayType('video/webm; codecs=vp8,vorbis') == 'probably') OK
+END OF TEST
+
Property changes on: trunk/LayoutTests/media/media-can-play-webm-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/media/media-can-play-webm.html (0 => 115798)
--- trunk/LayoutTests/media/media-can-play-webm.html (rev 0)
+++ trunk/LayoutTests/media/media-can-play-webm.html 2012-05-02 06:07:46 UTC (rev 115798)
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=""
+ <script>
+ function start() {
+ video = mediaElement = document.getElementsByTagName('video')[0];
+
+ testExpected("video.canPlayType('audio/webm')", "maybe");
+ testExpected("video.canPlayType('video/webm')", "maybe");
+
+ testExpected("video.canPlayType('audio/webm; codecs=vorbis')", "probably");
+ testExpected("video.canPlayType('video/webm; codecs=vp8,vorbis')", "probably");
+
+ endTest();
+ }
+ </script>
+ </head>
+ <body _onload_="start()">
+ <video controls></video>
+ <p>Test HTMLMediaElement <em>canPlayType()</em> method for webm media containers.</p>
+ <p>These tests may be expected to fail if the WebKit port does not support the format.</p>
+ </body>
+</html>
Property changes on: trunk/LayoutTests/media/media-can-play-webm.html
___________________________________________________________________
Added: svn:eol-style
Deleted: trunk/LayoutTests/media/video-can-play-type-expected.txt (115797 => 115798)
--- trunk/LayoutTests/media/video-can-play-type-expected.txt 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/video-can-play-type-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,17 +0,0 @@
-Test HTMLMediaElement canPlayType() method.
-
-EXPECTED (video.canPlayType() == '') OK
-EXPECTED (video.canPlayType('video/') == '') OK
-EXPECTED (video.canPlayType('video/blahblah') == '') OK
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"') == 'probably') OK
-EXPECTED (video.canPlayType(' Video/MP4 ; CODECS="mp4v.20.8, mp4a.40.2"') == 'probably') OK
-EXPECTED (video.canPlayType('audio/mpeg') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/Wav') == 'maybe') OK
-EXPECTED (video.canPlayType('video/blahblah; codecs="blah, , blah"') == '') OK
-EXPECTED (video.canPlayType('video/blahblah; codecs=blah') == '') OK
-EXPECTED (video.canPlayType('video/blahblah; codecs="blah"') == '') OK
-EXPECTED (video.canPlayType('video/blahblah; codecs="badcontent') == '') OK
-EXPECTED (video.canPlayType('video/blahblah; codecs=badcontent"') == '') OK
-EXPECTED (video.canPlayType('video/blahblah; codecs="badcontent"') == '') OK
-END OF TEST
-
Deleted: trunk/LayoutTests/media/video-can-play-type.html (115797 => 115798)
--- trunk/LayoutTests/media/video-can-play-type.html 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/media/video-can-play-type.html 2012-05-02 06:07:46 UTC (rev 115798)
@@ -1,35 +0,0 @@
-<html>
- <head>
- <style>
- video { background-color: yellow; width: 320px; height: 240px;}
- </style>
- </head>
- <body>
-
- <video controls ></video>
-
- <p>Test HTMLMediaElement <em>canPlayType()</em> method.</p>
-
- <script src=""
- <script>
-
- video = mediaElement = document.getElementsByTagName('video')[0];
-
- testExpected("video.canPlayType()", "");
- testExpected("video.canPlayType('video/')", "");
- testExpected("video.canPlayType('video/blahblah')", "");
- testExpected("video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"')", "probably");
- testExpected("video.canPlayType(' Video/MP4 ; CODECS=\"mp4v.20.8, mp4a.40.2\"')", "probably");
- testExpected("video.canPlayType('audio/mpeg')", "maybe");
- testExpected("video.canPlayType('audio/Wav')", "maybe");
- testExpected("video.canPlayType('video/blahblah; codecs=\"blah, , blah\"')", "");
- testExpected("video.canPlayType('video/blahblah; codecs=blah')", "");
- testExpected("video.canPlayType('video/blahblah; codecs=\"blah\"')", "");
- testExpected("video.canPlayType('video/blahblah; codecs=\"badcontent')", "");
- testExpected("video.canPlayType('video/blahblah; codecs=badcontent\"')", "");
- testExpected("video.canPlayType('video/blahblah; codecs="badcontent"')", "");
-
- endTest();
- </script>
- </body>
-</html>
Added: trunk/LayoutTests/platform/chromium/media/media-can-play-flac-audio-expected.txt (0 => 115798)
--- trunk/LayoutTests/platform/chromium/media/media-can-play-flac-audio-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/media/media-can-play-flac-audio-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -0,0 +1,8 @@
+Test HTMLMediaElement canPlayType() method with multiple .flac MIME types.
+
+These tests may be expected to fail if the WebKit port does not support the format.
+
+EXPECTED (audio.canPlayType('audio/x-flac') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (audio.canPlayType('audio/flac') == 'maybe'), OBSERVED '' FAIL
+END OF TEST
+
Property changes on: trunk/LayoutTests/platform/chromium/media/media-can-play-flac-audio-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/platform/chromium/media/media-can-play-mpeg-audio-expected.txt (0 => 115798)
--- trunk/LayoutTests/platform/chromium/media/media-can-play-mpeg-audio-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/media/media-can-play-mpeg-audio-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -0,0 +1,12 @@
+Test HTMLMediaElement canPlayType() method with multiple audio mpeg MIME types.
+
+These tests may be expected to fail if the WebKit port does not support the format.
+
+EXPECTED (audio.canPlayType('audio/x-mpeg') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (audio.canPlayType('audio/x-mp3') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (audio.canPlayType('audio/mp3') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (audio.canPlayType('audio/mpeg') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (audio.canPlayType('audio/mp4') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (audio.canPlayType('audio/aac') == 'maybe'), OBSERVED '' FAIL
+END OF TEST
+
Property changes on: trunk/LayoutTests/platform/chromium/media/media-can-play-mpeg-audio-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/platform/chromium/media/media-can-play-mpeg4-video-expected.txt (0 => 115798)
--- trunk/LayoutTests/platform/chromium/media/media-can-play-mpeg4-video-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/media/media-can-play-mpeg4-video-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -0,0 +1,10 @@
+Test HTMLMediaElement canPlayType() method with multiple video mpeg4 MIME types.
+
+These tests may be expected to fail if the WebKit port does not support the format.
+
+EXPECTED (video.canPlayType('video/x-m4v') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('video/mp4') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"') == 'probably'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType(' Video/MP4 ; CODECS="mp4v.20.8, mp4a.40.2"') == 'probably'), OBSERVED '' FAIL
+END OF TEST
+
Property changes on: trunk/LayoutTests/platform/chromium/media/media-can-play-mpeg4-video-expected.txt
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (115797 => 115798)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-02 06:07:03 UTC (rev 115797)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -746,10 +746,6 @@
// These tests are WONTFIX because they use codecs Chromium doesn't support.
WONTFIX SKIP : media/audio-mpeg-supported.html = TIMEOUT FAIL
WONTFIX SKIP : media/audio-mpeg4-supported.html = TIMEOUT FAIL
-WONTFIX SKIP : media/media-can-play-mpeg-audio.html = TEXT
-WONTFIX SKIP : media/media-can-play-mpeg4-video.html = TEXT
-WONTFIX SKIP : media/media-can-play-flac-audio.html = TEXT
-WONTFIX SKIP : media/video-can-play-type.html = TIMEOUT FAIL
WONTFIX SKIP : media/video-document-types.html = TIMEOUT FAIL
WONTFIX SKIP : media/video-element-other-namespace-crash.html = TIMEOUT
WONTFIX SKIP : media/video-size-intrinsic-scale.html = TIMEOUT FAIL
Added: trunk/LayoutTests/platform/mac/media/media-can-play-webm-expected.txt (0 => 115798)
--- trunk/LayoutTests/platform/mac/media/media-can-play-webm-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/media/media-can-play-webm-expected.txt 2012-05-02 06:07:46 UTC (rev 115798)
@@ -0,0 +1,10 @@
+Test HTMLMediaElement canPlayType() method for webm media containers.
+
+These tests may be expected to fail if the WebKit port does not support the format.
+
+EXPECTED (video.canPlayType('audio/webm') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('video/webm') == 'maybe'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('audio/webm; codecs=vorbis') == 'probably'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('video/webm; codecs=vp8,vorbis') == 'probably'), OBSERVED '' FAIL
+END OF TEST
+
Property changes on: trunk/LayoutTests/platform/mac/media/media-can-play-webm-expected.txt
___________________________________________________________________
Added: svn:eol-style
