<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175131] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175131">175131</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-10-23 11:28:56 -0700 (Thu, 23 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Safari cannot play 'audio/amr' content.
https://bugs.webkit.org/show_bug.cgi?id=137894
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/media-can-play-case-insensitive.html
Sites are returning 'video/amr' for AMR audio content, but the IANA spec says 'audio/AMR', which is also what
AVFoundation claims to support. However, MIME types are supposed to be case-insensitive. When creating our
mime type cache, case-fold to lower all MIME types given to us by our media frameworks.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::mimeTypeCache):
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::addFileTypesToCache):
LayoutTests:
* media/media-can-play-case-insensitive-expected.txt: Added.
* media/media-can-play-case-insensitive.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediacanplaycaseinsensitiveexpectedtxt">trunk/LayoutTests/media/media-can-play-case-insensitive-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediacanplaycaseinsensitivehtml">trunk/LayoutTests/media/media-can-play-case-insensitive.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175130 => 175131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-23 18:01:53 UTC (rev 175130)
+++ trunk/LayoutTests/ChangeLog 2014-10-23 18:28:56 UTC (rev 175131)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-10-23 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Safari cannot play 'audio/amr' content.
+ https://bugs.webkit.org/show_bug.cgi?id=137894
+
+ Reviewed by Eric Carlson.
+
+ * media/media-can-play-case-insensitive-expected.txt: Added.
+ * media/media-can-play-case-insensitive.html: Added.
+
</ins><span class="cx"> 2014-10-23 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> CSS JIT: Implement :matches
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediacanplaycaseinsensitiveexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-can-play-case-insensitive-expected.txt (0 => 175131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-can-play-case-insensitive-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-can-play-case-insensitive-expected.txt 2014-10-23 18:28:56 UTC (rev 175131)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+
+Test HTMLMediaElement canPlayType() method.
+
+EXPECTED (video.canPlayType('video/mp4') === video.canPlayType('video/MP4') == 'true') OK
+EXPECTED (video.canPlayType('VIDEO/mp4') === video.canPlayType('video/mp4') == 'true') OK
+EXPECTED (video.canPlayType('video/ogg') === video.canPlayType('video/OGG') == 'true') OK
+EXPECTED (video.canPlayType('video/ogg') === video.canPlayType('VIDEO/ogg') == 'true') OK
+EXPECTED (video.canPlayType('video/webm') === video.canPlayType('video/WEBM') == 'true') OK
+EXPECTED (video.canPlayType('video/webm') === video.canPlayType('VIDEO/webm') == 'true') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediacanplaycaseinsensitivehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-can-play-case-insensitive.html (0 => 175131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-can-play-case-insensitive.html (rev 0)
+++ trunk/LayoutTests/media/media-can-play-case-insensitive.html 2014-10-23 18:28:56 UTC (rev 175131)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="video-test.js"></script>
+ <script>
+ function start() {
+ video = document.getElementsByTagName('video')[0];
+
+ testExpected("video.canPlayType('video/mp4') === video.canPlayType('video/MP4')", true);
+ testExpected("video.canPlayType('VIDEO/mp4') === video.canPlayType('video/mp4')", true);
+ testExpected("video.canPlayType('video/ogg') === video.canPlayType('video/OGG')", true);
+ testExpected("video.canPlayType('video/ogg') === video.canPlayType('VIDEO/ogg')", true);
+ testExpected("video.canPlayType('video/webm') === video.canPlayType('video/WEBM')", true);
+ testExpected("video.canPlayType('video/webm') === video.canPlayType('VIDEO/webm')", true);
+
+ endTest();
+ }
+ </script>
+ </head>
+ <body onload="start()">
+ <video controls></video>
+ <p>Test HTMLMediaElement <em>canPlayType()</em> method.</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175130 => 175131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-23 18:01:53 UTC (rev 175130)
+++ trunk/Source/WebCore/ChangeLog 2014-10-23 18:28:56 UTC (rev 175131)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-10-23 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Safari cannot play 'audio/amr' content.
+ https://bugs.webkit.org/show_bug.cgi?id=137894
+
+ Reviewed by Eric Carlson.
+
+ Test: media/media-can-play-case-insensitive.html
+
+ Sites are returning 'video/amr' for AMR audio content, but the IANA spec says 'audio/AMR', which is also what
+ AVFoundation claims to support. However, MIME types are supposed to be case-insensitive. When creating our
+ mime type cache, case-fold to lower all MIME types given to us by our media frameworks.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::mimeTypeCache):
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::addFileTypesToCache):
+
</ins><span class="cx"> 2014-10-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Move Length-type CSS properties from DeprecatedStyleBuilder to the new Style Builder
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (175130 => 175131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-10-23 18:01:53 UTC (rev 175130)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-10-23 18:28:56 UTC (rev 175131)
</span><span class="lines">@@ -1452,7 +1452,7 @@
</span><span class="cx">
</span><span class="cx"> NSArray *types = [AVURLAsset audiovisualMIMETypes];
</span><span class="cx"> for (NSString *mimeType in types)
</span><del>- cache.add(mimeType);
</del><ins>+ cache.add([mimeType lowercaseString]);
</ins><span class="cx">
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (175130 => 175131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-10-23 18:01:53 UTC (rev 175130)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-10-23 18:28:56 UTC (rev 175131)
</span><span class="lines">@@ -1240,7 +1240,7 @@
</span><span class="cx"> Vector<String> typesForExtension = MIMETypeRegistry::getMediaMIMETypesForExtension(ext);
</span><span class="cx"> unsigned count = typesForExtension.size();
</span><span class="cx"> for (unsigned ndx = 0; ndx < count; ++ndx) {
</span><del>- String& type = typesForExtension[ndx];
</del><ins>+ String type = typesForExtension[ndx].lower();
</ins><span class="cx">
</span><span class="cx"> if (shouldRejectMIMEType(type))
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
</body>
</html>