<!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>[45779] branches/safari-4-branch</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/45779">45779</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2009-07-12 14:49:22 -0700 (Sun, 12 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge r45758.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari4branchLayoutTestsChangeLog">branches/safari-4-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari4branchLayoutTestsmediavideocanplaytypeexpectedtxt">branches/safari-4-branch/LayoutTests/media/video-can-play-type-expected.txt</a></li>
<li><a href="#branchessafari4branchLayoutTestsmediavideocanplaytypehtml">branches/safari-4-branch/LayoutTests/media/video-can-play-type.html</a></li>
<li><a href="#branchessafari4branchWebCoreChangeLog">branches/safari-4-branch/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari4branchWebCoreplatformgraphicsgtkMediaPlayerPrivateGStreamercpp">branches/safari-4-branch/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#branchessafari4branchWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">branches/safari-4-branch/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#branchessafari4branchWebCoreplatformgraphicswinMediaPlayerPrivateQuickTimeWincpp">branches/safari-4-branch/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari4branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-4-branch/LayoutTests/ChangeLog (45778 => 45779)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-4-branch/LayoutTests/ChangeLog        2009-07-12 21:49:19 UTC (rev 45778)
+++ branches/safari-4-branch/LayoutTests/ChangeLog        2009-07-12 21:49:22 UTC (rev 45779)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2009-07-12  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r45758.
+
+    2009-07-11  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Reviewed by Antti Koivisto.
+
+        HTMLMediaElement.canPlayType &quot;maybe&quot; and &quot;probably&quot; reversed
+        https://bugs.webkit.org/show_bug.cgi?id=27186
+
+        * media/video-can-play-type-expected.txt:
+        * media/video-can-play-type.html:
+
+2009-07-12  Mark Rowe  &lt;mrowe@apple.com&gt;
+
</ins><span class="cx">         Merge r45744.
</span><span class="cx"> 
</span><span class="cx">     2009-07-10  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari4branchLayoutTestsmediavideocanplaytypeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-4-branch/LayoutTests/media/video-can-play-type-expected.txt (45778 => 45779)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-4-branch/LayoutTests/media/video-can-play-type-expected.txt        2009-07-12 21:49:19 UTC (rev 45778)
+++ branches/safari-4-branch/LayoutTests/media/video-can-play-type-expected.txt        2009-07-12 21:49:22 UTC (rev 45779)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> EXPECTED (video.canPlayType() == '') OK
</span><span class="cx"> EXPECTED (video.canPlayType('video/') == '') OK
</span><span class="cx"> EXPECTED (video.canPlayType('video/blahblah') == '') OK
</span><del>-EXPECTED (video.canPlayType('video/mpeg; codecs=&quot;avc1.4D400C&quot;') == 'maybe') OK
-EXPECTED (video.canPlayType(' video/mp4 ; video/mp4; codecs=&quot;mp4v.20.8, mp4a.40.2&quot;') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/mpeg') == 'probably') OK
-EXPECTED (video.canPlayType('audio/wav') == 'probably') OK
</del><ins>+EXPECTED (video.canPlayType('video/mpeg; codecs=&quot;avc1.4D400C&quot;') == 'probably') OK
+EXPECTED (video.canPlayType(' video/mp4 ; video/mp4; codecs=&quot;mp4v.20.8, mp4a.40.2&quot;') == 'probably') OK
+EXPECTED (video.canPlayType('audio/mpeg') == 'maybe') OK
+EXPECTED (video.canPlayType('audio/wav') == 'maybe') OK
</ins><span class="cx"> END OF TEST
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari4branchLayoutTestsmediavideocanplaytypehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-4-branch/LayoutTests/media/video-can-play-type.html (45778 => 45779)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-4-branch/LayoutTests/media/video-can-play-type.html        2009-07-12 21:49:19 UTC (rev 45778)
+++ branches/safari-4-branch/LayoutTests/media/video-can-play-type.html        2009-07-12 21:49:22 UTC (rev 45779)
</span><span class="lines">@@ -18,10 +18,10 @@
</span><span class="cx">             testExpected(&quot;video.canPlayType()&quot;, &quot;&quot;);
</span><span class="cx">             testExpected(&quot;video.canPlayType('video/')&quot;, &quot;&quot;);
</span><span class="cx">             testExpected(&quot;video.canPlayType('video/blahblah')&quot;, &quot;&quot;);
</span><del>-            testExpected(&quot;video.canPlayType('video/mpeg; codecs=&amp;quot;avc1.4D400C&amp;quot;')&quot;, &quot;maybe&quot;);
-            testExpected(&quot;video.canPlayType('        video/mp4  ; video/mp4; codecs=&amp;quot;mp4v.20.8, mp4a.40.2&amp;quot;')&quot;, &quot;maybe&quot;);
-            testExpected(&quot;video.canPlayType('audio/mpeg')&quot;, &quot;probably&quot;);
-            testExpected(&quot;video.canPlayType('audio/wav')&quot;, &quot;probably&quot;);
</del><ins>+            testExpected(&quot;video.canPlayType('video/mpeg; codecs=&amp;quot;avc1.4D400C&amp;quot;')&quot;, &quot;probably&quot;);
+            testExpected(&quot;video.canPlayType('        video/mp4  ; video/mp4; codecs=&amp;quot;mp4v.20.8, mp4a.40.2&amp;quot;')&quot;, &quot;probably&quot;);
+            testExpected(&quot;video.canPlayType('audio/mpeg')&quot;, &quot;maybe&quot;);
+            testExpected(&quot;video.canPlayType('audio/wav')&quot;, &quot;maybe&quot;);
</ins><span class="cx"> 
</span><span class="cx">             endTest();
</span><span class="cx">         &lt;/script&gt;
</span></span></pre></div>
<a id="branchessafari4branchWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-4-branch/WebCore/ChangeLog (45778 => 45779)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-4-branch/WebCore/ChangeLog        2009-07-12 21:49:19 UTC (rev 45778)
+++ branches/safari-4-branch/WebCore/ChangeLog        2009-07-12 21:49:22 UTC (rev 45779)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2009-07-12  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r45758.
+
+    2009-07-11  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        Reviewed by Antti Koivisto.
+
+        HTMLMediaElement.canPlayType &quot;maybe&quot; and &quot;probably&quot; reversed
+        https://bugs.webkit.org/show_bug.cgi?id=27186
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::supportsType):
+            Return &quot;probably&quot; if type has codecs parameter.
+
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivate::supportsType):
+            Ditto.
+
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
+        (WebCore::MediaPlayerPrivate::supportsType):
+            Ditto.
+
+2009-07-12  Mark Rowe  &lt;mrowe@apple.com&gt;
+
</ins><span class="cx">         Merge r45755.
</span><span class="cx"> 
</span><span class="cx">     2009-07-11  Brady Eidson  &lt;beidson@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari4branchWebCoreplatformgraphicsgtkMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-4-branch/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp (45778 => 45779)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-4-branch/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp        2009-07-12 21:49:19 UTC (rev 45778)
+++ branches/safari-4-branch/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp        2009-07-12 21:49:22 UTC (rev 45779)
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> {
</span><span class="cx">     // FIXME: query the engine to see what types are supported
</span><span class="cx">     notImplemented();
</span><del>-    return type == &quot;video/x-theora+ogg&quot; ? (!codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported) : MediaPlayer::IsNotSupported;
</del><ins>+    return type == &quot;video/x-theora+ogg&quot; ? (codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported) : MediaPlayer::IsNotSupported;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivate::createGSTPlayBin(String url)
</span></span></pre></div>
<a id="branchessafari4branchWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-4-branch/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (45778 => 45779)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-4-branch/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm        2009-07-12 21:49:19 UTC (rev 45778)
+++ branches/safari-4-branch/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm        2009-07-12 21:49:22 UTC (rev 45779)
</span><span class="lines">@@ -1215,7 +1215,7 @@
</span><span class="cx"> 
</span><span class="cx">     // We check the &quot;modern&quot; type cache first, as it doesn't require QTKitServer to start.
</span><span class="cx">     if (mimeModernTypesCache().contains(type) || mimeCommonTypesCache().contains(type))
</span><del>-        return (codecs &amp;&amp; !codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported);
</del><ins>+        return codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported;
</ins><span class="cx"> 
</span><span class="cx">     return MediaPlayer::IsNotSupported;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari4branchWebCoreplatformgraphicswinMediaPlayerPrivateQuickTimeWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-4-branch/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp (45778 => 45779)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-4-branch/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp        2009-07-12 21:49:19 UTC (rev 45778)
+++ branches/safari-4-branch/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp        2009-07-12 21:49:22 UTC (rev 45779)
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> {
</span><span class="cx">     // only return &quot;IsSupported&quot; if there is no codecs parameter for now as there is no way to ask QT if it supports an
</span><span class="cx">     //  extended MIME type
</span><del>-    return mimeTypeCache().contains(type) ? (!codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported) : MediaPlayer::IsNotSupported;
</del><ins>+    return mimeTypeCache().contains(type) ? (codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported) : MediaPlayer::IsNotSupported;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivate::movieEnded(QTMovieWin* movie)
</span></span></pre>
</div>
</div>

</body>
</html>