[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
eric.carlson at apple.com
eric.carlson at apple.com
Wed Dec 22 11:08:56 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7c8489a9b1b1f43d7318a580f2239eda706680df
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 13 20:12:07 2010 +0000
2010-07-13 Eric Carlson <eric.carlson at apple.com>
Reviewed by Dan Bernstein.
On Leopard, media element can't handle audio/mp4 MIME type in source tag
https://bugs.webkit.org/show_bug.cgi?id=29326
Test: media/media-can-play-mpeg-audio.html
* platform/MIMETypeRegistry.cpp:
(WebCore::TypeExtensionPair::): Add "audio/mp4", "m4a" to mappings table.
2010-07-13 Eric Carlson <eric.carlson at apple.com>
Reviewed by Dan Bernstein.
On Leopard, media element can't handle audio/mp4 MIME type in source tag
https://bugs.webkit.org/show_bug.cgi?id=29326
Rename media-can-play-mp3 to media-can-play-mpeg-audio and add "audio/mp4" and "audio/aac" tests.
* media/media-can-play-mp3-expected.txt: Removed.
* media/media-can-play-mp3.html: Removed.
* media/media-can-play-mpeg-audio-expected.txt: Copied from LayoutTests/media/media-can-play-mp3-expected.txt.
* media/media-can-play-mpeg-audio.html: Copied from LayoutTests/media/media-can-play-mp3.html.
* platform/gtk/Skipped:
* platform/qt/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63239 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 78fa578..e3ab66a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-13 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ On Leopard, media element can't handle audio/mp4 MIME type in source tag
+ https://bugs.webkit.org/show_bug.cgi?id=29326
+
+ Rename media-can-play-mp3 to media-can-play-mpeg-audio and add "audio/mp4" and "audio/aac" tests.
+
+ * media/media-can-play-mp3-expected.txt: Removed.
+ * media/media-can-play-mp3.html: Removed.
+ * media/media-can-play-mpeg-audio-expected.txt: Copied from LayoutTests/media/media-can-play-mp3-expected.txt.
+ * media/media-can-play-mpeg-audio.html: Copied from LayoutTests/media/media-can-play-mp3.html.
+ * platform/gtk/Skipped:
+ * platform/qt/Skipped:
+
2010-07-13 Robert Hogan <robert at webkit.org>
[Gtk] Skip http/tests/uppercase-mime-type.html on Gtk
@@ -38,7 +54,7 @@
* http/tests/mime/uppercase-mime-type-expected.txt:
* http/tests/mime/uppercase-mime-type.html:
-2010-07-10 Zhenyao Mo <zmo at google.com>
+2010-07-13 Zhenyao Mo <zmo at google.com>
Reviewed by Darin Fisher.
diff --git a/LayoutTests/media/media-can-play-mp3-expected.txt b/LayoutTests/media/media-can-play-mp3-expected.txt
deleted file mode 100644
index 5d8b3a8..0000000
--- a/LayoutTests/media/media-can-play-mp3-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Test HTMLMediaElement canPlayType() method with multiple mp3 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
-END OF TEST
-
diff --git a/LayoutTests/media/media-can-play-mp3.html b/LayoutTests/media/media-can-play-mp3.html
deleted file mode 100644
index c804e29..0000000
--- a/LayoutTests/media/media-can-play-mp3.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
- <head>
- <style>
- video { background-color: yellow; width: 320px; height: 240px;}
- </style>
- <script src=video-test.js></script>
- <script>
- function start()
- {
- video = mediaElement = document.getElementsByTagName('video')[0];
-
- testExpected("video.canPlayType('audio/x-mpeg')", "maybe");
- testExpected("video.canPlayType('audio/x-mp3')", "maybe");
- testExpected("video.canPlayType('audio/mp3')", "maybe");
-
- endTest();
- }
- </script>
-
- </head>
- <body onload="start()">
-
- <video controls ></video>
-
- <p>Test HTMLMediaElement <em>canPlayType()</em> method with multiple mp3 MIME types.</p>
-
- </body>
-</html>
diff --git a/LayoutTests/media/media-can-play-mpeg-audio-expected.txt b/LayoutTests/media/media-can-play-mpeg-audio-expected.txt
new file mode 100644
index 0000000..d360a1b
--- /dev/null
+++ b/LayoutTests/media/media-can-play-mpeg-audio-expected.txt
@@ -0,0 +1,9 @@
+Test HTMLMediaElement canPlayType() method with multiple mp3 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
+END OF TEST
+
diff --git a/LayoutTests/media/media-can-play-mpeg-audio.html b/LayoutTests/media/media-can-play-mpeg-audio.html
new file mode 100644
index 0000000..9889469
--- /dev/null
+++ b/LayoutTests/media/media-can-play-mpeg-audio.html
@@ -0,0 +1,31 @@
+<html>
+ <head>
+ <style>
+ video { background-color: yellow; width: 320px; height: 240px;}
+ </style>
+ <script src=video-test.js></script>
+ <script>
+ function start()
+ {
+ video = mediaElement = document.getElementsByTagName('video')[0];
+
+ testExpected("video.canPlayType('audio/x-mpeg')", "maybe");
+ testExpected("video.canPlayType('audio/x-mp3')", "maybe");
+ testExpected("video.canPlayType('audio/mp3')", "maybe");
+
+ testExpected("video.canPlayType('audio/mp4')", "maybe");
+ testExpected("video.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>
+
+ </body>
+</html>
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index e693565..84060c0 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3329,7 +3329,7 @@ media/media-captions.html
media/video-poster-scale.html
# don't play mp3 files
-media/media-can-play-mp3.html
+media/media-can-play-mpeg-audio.html
# Tests in plugins/ directory
# These tests require ObjC plugin, do not bother trying to get them to work
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index c2cbea2..c13d5e5 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -661,7 +661,7 @@ media/audio-no-installed-engines.html
media/audio-play-event.html
media/before-load-member-access.html
media/broken-video.html
-media/media-can-play-mp3.html
+media/media-can-play-mpeg-audio.html
media/constructors.html
media/controls-after-reload.html
media/controls-css-overload.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 74c269b..df02571 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-13 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ On Leopard, media element can't handle audio/mp4 MIME type in source tag
+ https://bugs.webkit.org/show_bug.cgi?id=29326
+
+ Test: media/media-can-play-mpeg-audio.html
+
+ * platform/MIMETypeRegistry.cpp:
+ (WebCore::TypeExtensionPair::): Add "audio/mp4", "m4a" to mappings table.
+
2010-07-13 Tony Gentilcore <tonyg at chromium.org>
Reviewed by Darin Fisher.
@@ -91,7 +103,7 @@
* rendering/RenderObject.cpp:
(WebCore::RenderObject::repaintAfterLayoutIfNeeded):
-2010-07-10 Zhenyao Mo <zmo at google.com>
+2010-07-13 Zhenyao Mo <zmo at google.com>
Reviewed by Darin Fisher.
diff --git a/WebCore/platform/MIMETypeRegistry.cpp b/WebCore/platform/MIMETypeRegistry.cpp
index ec76b1a..3740144 100644
--- a/WebCore/platform/MIMETypeRegistry.cpp
+++ b/WebCore/platform/MIMETypeRegistry.cpp
@@ -276,6 +276,7 @@ static MediaMIMETypeMap& mediaMIMETypeMap()
{ "audio/x-m4a", "m4a" },
{ "audio/x-m4b", "m4b" },
{ "audio/x-m4p", "m4p" },
+ { "audio/mp4", "m4a" },
// MP3
{ "audio/mp3", "mp3" },
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list