Diff
Modified: trunk/LayoutTests/ChangeLog (109237 => 109238)
--- trunk/LayoutTests/ChangeLog 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/LayoutTests/ChangeLog 2012-02-29 19:53:49 UTC (rev 109238)
@@ -1,3 +1,23 @@
+2012-02-29 Max Feil <[email protected]>
+
+ [BlackBerry] Add support for FLAC audio and OGG/Vorbis audio
+ https://bugs.webkit.org/show_bug.cgi?id=79519
+
+ Reviewed by Antonio Gomes.
+
+ A layout test already exists for OGG. We do not support OGG
+ video at this time, only audio.
+
+ * media/media-can-play-flac-audio-expected.txt: Added.
+ * media/media-can-play-flac-audio.html: Added.
+ * platform/chromium/test_expectations.txt:
+ * platform/efl/Skipped:
+ * platform/gtk/Skipped:
+ * platform/mac/Skipped:
+ * platform/qt/Skipped:
+ * platform/win/Skipped:
+ * platform/wincairo/Skipped:
+
2012-02-29 Greg Billock <[email protected]>
Add more tests for web intents
Added: trunk/LayoutTests/media/media-can-play-flac-audio-expected.txt (0 => 109238)
--- trunk/LayoutTests/media/media-can-play-flac-audio-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-can-play-flac-audio-expected.txt 2012-02-29 19:53:49 UTC (rev 109238)
@@ -0,0 +1,6 @@
+Test HTMLMediaElement canPlayType() method with multiple .flac MIME types.
+
+EXPECTED (audio.canPlayType('audio/flac') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/x-flac') == 'maybe') OK
+END OF TEST
+
Added: trunk/LayoutTests/media/media-can-play-flac-audio.html (0 => 109238)
--- trunk/LayoutTests/media/media-can-play-flac-audio.html (rev 0)
+++ trunk/LayoutTests/media/media-can-play-flac-audio.html 2012-02-29 19:53:49 UTC (rev 109238)
@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+ <head>
+ <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");
+
+ endTest();
+ }
+ </script>
+
+ </head>
+ <body _onload_="start()">
+
+ <audio controls ></audio>
+
+ <p>Test HTMLMediaElement <em>canPlayType()</em> method with multiple .flac MIME types.</p>
+
+ </body>
+</html>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (109237 => 109238)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-29 19:53:49 UTC (rev 109238)
@@ -485,6 +485,7 @@
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
Modified: trunk/LayoutTests/platform/efl/Skipped (109237 => 109238)
--- trunk/LayoutTests/platform/efl/Skipped 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-02-29 19:53:49 UTC (rev 109238)
@@ -2873,3 +2873,7 @@
media/video-colorspace-yuv420.html
media/video-colorspace-yuv422.html
perf/nested-combined-selectors.html
+
+# This test requires flac codec
+media/media-can-play-flac-audio.html
+
Modified: trunk/LayoutTests/platform/gtk/Skipped (109237 => 109238)
--- trunk/LayoutTests/platform/gtk/Skipped 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/LayoutTests/platform/gtk/Skipped 2012-02-29 19:53:49 UTC (rev 109238)
@@ -1597,3 +1597,6 @@
fast/dom/MediaStream/argument-types.html
fast/mediastream/peerconnection-Attributes.html
fast/mediastream/peerconnection-argument-types.html
+
+# This test requires flac codec
+media/media-can-play-flac-audio.html
Modified: trunk/LayoutTests/platform/mac/Skipped (109237 => 109238)
--- trunk/LayoutTests/platform/mac/Skipped 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-02-29 19:53:49 UTC (rev 109238)
@@ -88,6 +88,9 @@
# This test requires ogg codecs
media/media-can-play-ogg.html
+# This test requires flac codec
+media/media-can-play-flac-audio.html
+
# These tests require touch support
fast/events/touch
Modified: trunk/LayoutTests/platform/qt/Skipped (109237 => 109238)
--- trunk/LayoutTests/platform/qt/Skipped 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-02-29 19:53:49 UTC (rev 109238)
@@ -959,6 +959,9 @@
media/video-zoom-controls.html
media/video-zoom.html
+# This test requires flac codec
+media/media-can-play-flac-audio.html
+
# Video size reported as 0,0 due to how size-hints are reported by QtMultimedia
media/video-poster-delayed.html
Modified: trunk/LayoutTests/platform/win/Skipped (109237 => 109238)
--- trunk/LayoutTests/platform/win/Skipped 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/LayoutTests/platform/win/Skipped 2012-02-29 19:53:49 UTC (rev 109238)
@@ -908,6 +908,9 @@
# This test requires ogg codecs
media/media-can-play-ogg.html
+# This test requires flac codec
+media/media-can-play-flac-audio.html
+
# These tests require touch support
fast/events/touch
Modified: trunk/LayoutTests/platform/wincairo/Skipped (109237 => 109238)
--- trunk/LayoutTests/platform/wincairo/Skipped 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/LayoutTests/platform/wincairo/Skipped 2012-02-29 19:53:49 UTC (rev 109238)
@@ -1430,6 +1430,9 @@
# This test requires ogg codecs
media/media-can-play-ogg.html
+# This test requires flac codec
+media/media-can-play-flac-audio.html
+
# These tests require touch support
fast/events/touch
Modified: trunk/Source/WebCore/ChangeLog (109237 => 109238)
--- trunk/Source/WebCore/ChangeLog 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/Source/WebCore/ChangeLog 2012-02-29 19:53:49 UTC (rev 109238)
@@ -1,3 +1,18 @@
+2012-02-29 Max Feil <[email protected]>
+
+ [BlackBerry] Add support for FLAC audio and OGG/Vorbis audio
+ https://bugs.webkit.org/show_bug.cgi?id=79519
+
+ Reviewed by Antonio Gomes.
+
+ A layout test already exists for OGG. We do not support OGG
+ video at this time, only audio.
+
+ Test: media/media-can-play-flac-audio.html
+
+ * platform/blackberry/MIMETypeRegistryBlackBerry.cpp:
+ (WebCore):
+
2012-02-28 Beth Dakin <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=79868
Modified: trunk/Source/WebCore/platform/blackberry/MIMETypeRegistryBlackBerry.cpp (109237 => 109238)
--- trunk/Source/WebCore/platform/blackberry/MIMETypeRegistryBlackBerry.cpp 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/Source/WebCore/platform/blackberry/MIMETypeRegistryBlackBerry.cpp 2012-02-29 19:53:49 UTC (rev 109238)
@@ -97,6 +97,9 @@
{ "m3u8", "application/vnd.apple.mpegurl" },
{ "m3url", "audio/mpegurl" },
{ "m3u", "audio/mpegurl" },
+ { "flac", "audio/x-flac" },
+ { "ogg", "audio/ogg" },
+ { "oga", "audio/ogg" },
// FIXME: wince also maps ttf and otf to text/plain. Should we do that too?
{ 0, 0 }
};
Modified: trunk/Source/WebKit/blackberry/Api/WebSettings.cpp (109237 => 109238)
--- trunk/Source/WebKit/blackberry/Api/WebSettings.cpp 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings.cpp 2012-02-29 19:53:49 UTC (rev 109238)
@@ -131,6 +131,7 @@
mimeTypeMap->add("audio/x-aac", "audio/aac");
mimeTypeMap->add("audio/x-amr", "audio/amr");
mimeTypeMap->add("audio/mpegurl", "audio/x-mpegurl");
+ mimeTypeMap->add("audio/flac", "audio/x-flac");
mimeTypeMap->add("video/3gp", "video/3gpp");
mimeTypeMap->add("video/avi", "video/x-msvideo");
mimeTypeMap->add("video/x-m4v", "video/mp4");
Modified: trunk/Source/WebKit/blackberry/ChangeLog (109237 => 109238)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-02-29 19:51:54 UTC (rev 109237)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-02-29 19:53:49 UTC (rev 109238)
@@ -1,3 +1,13 @@
+2012-02-29 Max Feil <[email protected]>
+
+ [BlackBerry] Add support for FLAC audio and OGG/Vorbis audio
+ https://bugs.webkit.org/show_bug.cgi?id=79519
+
+ Reviewed by Antonio Gomes.
+
+ * Api/WebSettings.cpp:
+ (BlackBerry::WebKit::mimeTypeAssociationMap):
+
2012-02-28 Konrad Piascik <[email protected]>
[BlackBerry] Change the API to use std::string
