[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 12:34:39 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e8cc059b60166bb224dab5b4f9ee5082d937fcb8
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 25 17:51:26 2010 +0000
2010-08-25 Eric Carlson <eric.carlson at apple.com>
Reviewed by Alexey Proskuryakov.
HTMLMediaElement.canPlayType must be case insensitive for MIME type.
https://bugs.webkit.org/show_bug.cgi?id=44577
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::load):
(WebCore::MediaPlayer::supportsType):
2010-08-24 Eric Carlson <eric.carlson at apple.com>
Reviewed by Alexey Proskuryakov.
HTMLMediaElement.canPlayType must be case insensitive for MIME type.
https://bugs.webkit.org/show_bug.cgi?id=44577
* 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/video-can-play-type-expected.txt:
* media/video-can-play-type.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66023 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3fcbab2..59d7da6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-24 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ HTMLMediaElement.canPlayType must be case insensitive for MIME type.
+ https://bugs.webkit.org/show_bug.cgi?id=44577
+
+ * 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/video-can-play-type-expected.txt:
+ * media/video-can-play-type.html:
+
2010-08-25 Tony Chang <tony at chromium.org>
Reviewed by Ojan Vafai.
diff --git a/LayoutTests/media/media-can-play-octet-stream-expected.txt b/LayoutTests/media/media-can-play-octet-stream-expected.txt
index da68b21..34f9935 100644
--- a/LayoutTests/media/media-can-play-octet-stream-expected.txt
+++ b/LayoutTests/media/media-can-play-octet-stream-expected.txt
@@ -1,12 +1,12 @@
Test HTMLMediaElement canPlayType() method with "application/octet-stream".
++ Test with <video> element.
-EXPECTED (mediaElement.canPlayType('application/octet-stream') == 'maybe') OK
+EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == 'maybe') OK
EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=theora') == '') OK
EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=mp4') == '') OK
++ Test with <audio> element.
-EXPECTED (mediaElement.canPlayType('application/octet-stream') == 'maybe') OK
+EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == 'maybe') OK
EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=theora') == '') OK
EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=mp4') == '') OK
END OF TEST
diff --git a/LayoutTests/media/media-can-play-octet-stream.html b/LayoutTests/media/media-can-play-octet-stream.html
index 6aad6a0..375f6ca 100644
--- a/LayoutTests/media/media-can-play-octet-stream.html
+++ b/LayoutTests/media/media-can-play-octet-stream.html
@@ -9,7 +9,7 @@
<script>
function test()
{
- testExpected("mediaElement.canPlayType('application/octet-stream')", "maybe");
+ testExpected("mediaElement.canPlayType('APPLICATION/octet-stream')", "maybe");
testExpected("mediaElement.canPlayType('application/octet-stream;codecs=theora')", "");
testExpected("mediaElement.canPlayType('application/octet-stream;codecs=mp4')", "");
}
diff --git a/LayoutTests/media/media-can-play-ogg-expected.txt b/LayoutTests/media/media-can-play-ogg-expected.txt
index 18ff058..4f0a5a9 100644
--- a/LayoutTests/media/media-can-play-ogg-expected.txt
+++ b/LayoutTests/media/media-can-play-ogg-expected.txt
@@ -1,6 +1,6 @@
Test HTMLMediaElement canPlayType() method for ogg media containers.
-EXPECTED (video.canPlayType('audio/ogg') == 'maybe') OK
-EXPECTED (video.canPlayType('video/ogg') == 'maybe') OK
+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
index 29fda55..4ac9aa7 100644
--- a/LayoutTests/media/media-can-play-ogg.html
+++ b/LayoutTests/media/media-can-play-ogg.html
@@ -14,8 +14,8 @@
<script>
video = mediaElement = document.getElementsByTagName('video')[0];
- testExpected("video.canPlayType('audio/ogg')", "maybe");
- testExpected("video.canPlayType('video/ogg')", "maybe");
+ testExpected("video.canPlayType('Audio/ogg')", "maybe");
+ testExpected("video.canPlayType('Video/ogg')", "maybe");
endTest();
</script>
diff --git a/LayoutTests/media/video-can-play-type-expected.txt b/LayoutTests/media/video-can-play-type-expected.txt
index 166b28b..60df4ac 100644
--- a/LayoutTests/media/video-can-play-type-expected.txt
+++ b/LayoutTests/media/video-can-play-type-expected.txt
@@ -3,9 +3,9 @@ Test HTMLMediaElement canPlayType() method.
EXPECTED (video.canPlayType() == '') OK
EXPECTED (video.canPlayType('video/') == '') OK
EXPECTED (video.canPlayType('video/blahblah') == '') OK
-EXPECTED (video.canPlayType('video/mpeg; codecs="avc1.4D400C"') == 'probably') OK
-EXPECTED (video.canPlayType(' video/mp4 ; video/mp4; codecs="mp4v.20.8, mp4a.40.2"') == 'probably') OK
+EXPECTED (video.canPlayType('video/mpeg; 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('audio/Wav') == 'maybe') OK
END OF TEST
diff --git a/LayoutTests/media/video-can-play-type.html b/LayoutTests/media/video-can-play-type.html
index 2bf8a75..873381d 100644
--- a/LayoutTests/media/video-can-play-type.html
+++ b/LayoutTests/media/video-can-play-type.html
@@ -18,10 +18,10 @@
testExpected("video.canPlayType()", "");
testExpected("video.canPlayType('video/')", "");
testExpected("video.canPlayType('video/blahblah')", "");
- testExpected("video.canPlayType('video/mpeg; codecs="avc1.4D400C"')", "probably");
- testExpected("video.canPlayType(' video/mp4 ; video/mp4; codecs="mp4v.20.8, mp4a.40.2"')", "probably");
+ testExpected("video.canPlayType('video/mpeg; 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('audio/Wav')", "maybe");
endTest();
</script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9269315..898dd98 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-25 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ HTMLMediaElement.canPlayType must be case insensitive for MIME type.
+ https://bugs.webkit.org/show_bug.cgi?id=44577
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::load):
+ (WebCore::MediaPlayer::supportsType):
+
2010-08-25 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 4a7b70b..36d9a87 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -273,7 +273,7 @@ MediaPlayer::~MediaPlayer()
void MediaPlayer::load(const String& url, const ContentType& contentType)
{
- String type = contentType.type();
+ String type = contentType.type().lower();
String typeCodecs = contentType.parameter(codecs());
// If the MIME type is unhelpful, see if the type registry has a match for the file extension.
@@ -556,7 +556,7 @@ void MediaPlayer::paintCurrentFrameInContext(GraphicsContext* p, const IntRect&
MediaPlayer::SupportsType MediaPlayer::supportsType(ContentType contentType)
{
- String type = contentType.type();
+ String type = contentType.type().lower();
String typeCodecs = contentType.parameter(codecs());
// 4.8.10.3 MIME types - In the absence of a specification to the contrary, the MIME type "application/octet-stream"
@@ -572,7 +572,6 @@ MediaPlayer::SupportsType MediaPlayer::supportsType(ContentType contentType)
}
MediaPlayerFactory* engine = chooseBestEngineForTypeAndCodecs(type, typeCodecs);
-
if (!engine)
return IsNotSupported;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list