<!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>[189209] trunk/Source/WebCore</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/189209">189209</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-01 08:49:33 -0700 (Tue, 01 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Possible CFArray leak in MediaPlayerPrivateAVFoundationCF.cpp
https://bugs.webkit.org/show_bug.cgi?id=148668
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-09-01
Reviewed by Eric Carlson.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::mimeTypeCache): Deleted.
(WebCore::avfMIMETypes):
Fix the leak in avfMIMETypes. Consolidate on the single implementation.
Note that avfMIMETypes lowercased the inputs and mimeTypeCache did not,
but we now match MediaPlayerPrivateAVFoundationObjC which has one version
that lowercased inputs as well.
(WebCore::MediaPlayerPrivateAVFoundationCF::getSupportedTypes):
(WebCore::MediaPlayerPrivateAVFoundationCF::supportsType):
(WebCore::MediaPlayerPrivateAVFoundationCF::supportsKeySystem):
Convert to th enew verison.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189208 => 189209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-01 15:04:08 UTC (rev 189208)
+++ trunk/Source/WebCore/ChangeLog 2015-09-01 15:49:33 UTC (rev 189209)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-09-01 Joseph Pecoraro <pecoraro@apple.com>
+
+ Possible CFArray leak in MediaPlayerPrivateAVFoundationCF.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=148668
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::mimeTypeCache): Deleted.
+ (WebCore::avfMIMETypes):
+ Fix the leak in avfMIMETypes. Consolidate on the single implementation.
+ Note that avfMIMETypes lowercased the inputs and mimeTypeCache did not,
+ but we now match MediaPlayerPrivateAVFoundationObjC which has one version
+ that lowercased inputs as well.
+
+ (WebCore::MediaPlayerPrivateAVFoundationCF::getSupportedTypes):
+ (WebCore::MediaPlayerPrivateAVFoundationCF::supportsType):
+ (WebCore::MediaPlayerPrivateAVFoundationCF::supportsKeySystem):
+ Convert to th enew verison.
+
</ins><span class="cx"> 2015-09-01 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Layout is wrong for flex factor sum between 0 and 1
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (189208 => 189209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-09-01 15:04:08 UTC (rev 189208)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-09-01 15:49:33 UTC (rev 189209)
</span><span class="lines">@@ -872,33 +872,6 @@
</span><span class="cx"> m_videoFrameHasDrawn = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const HashSet<String>& mimeTypeCache()
-{
- static NeverDestroyed<HashSet<String>> cache;
- static bool typeListInitialized = false;
-
- if (typeListInitialized)
- return cache;
- typeListInitialized = true;
-
- RetainPtr<CFArrayRef> supportedTypes = adoptCF(AVCFURLAssetCopyAudiovisualMIMETypes());
-
- ASSERT(supportedTypes);
- if (!supportedTypes)
- return cache;
-
- CFIndex typeCount = CFArrayGetCount(supportedTypes.get());
- for (CFIndex i = 0; i < typeCount; i++)
- cache.get().add(static_cast<CFStringRef>(CFArrayGetValueAtIndex(supportedTypes.get(), i)));
-
- return cache;
-}
-
-void MediaPlayerPrivateAVFoundationCF::getSupportedTypes(HashSet<String>& supportedTypes)
-{
- supportedTypes = mimeTypeCache();
-}
-
</del><span class="cx"> #if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> static bool keySystemIsSupported(const String& keySystem)
</span><span class="cx"> {
</span><span class="lines">@@ -912,7 +885,7 @@
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<HashSet<String>> cache = []() {
</span><span class="cx"> HashSet<String> types;
</span><del>- RetainPtr<CFArrayRef> avTypes = AVCFURLAssetCopyAudiovisualMIMETypes();
</del><ins>+ RetainPtr<CFArrayRef> avTypes = adoptCF(AVCFURLAssetCopyAudiovisualMIMETypes());
</ins><span class="cx">
</span><span class="cx"> CFIndex typeCount = CFArrayGetCount(avTypes.get());
</span><span class="cx"> for (CFIndex i = 0; i < typeCount; ++i) {
</span><span class="lines">@@ -926,6 +899,11 @@
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateAVFoundationCF::getSupportedTypes(HashSet<String>& supportedTypes)
+{
+ supportedTypes = avfMIMETypes();
+}
+
</ins><span class="cx"> MediaPlayer::SupportsType MediaPlayerPrivateAVFoundationCF::supportsType(const MediaEngineSupportParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> if (isUnsupportedMIMEType(parameters.type))
</span><span class="lines">@@ -943,7 +921,7 @@
</span><span class="cx"> String typeString = parameters.type + "; codecs=\"" + parameters.codecs + "\"";
</span><span class="cx"> return AVCFURLAssetIsPlayableExtendedMIMEType(typeString.createCFString().get()) ? MediaPlayer::IsSupported : MediaPlayer::MayBeSupported;
</span><span class="cx"> #else
</span><del>- if (mimeTypeCache().contains(parameters.type))
</del><ins>+ if (avfMIMETypes().contains(parameters.type))
</ins><span class="cx"> return parameters.codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported;
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx"> #endif
</span><span class="lines">@@ -958,7 +936,7 @@
</span><span class="cx"> if (!keySystemIsSupported(keySystem))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!mimeType.isEmpty() && !mimeTypeCache().contains(mimeType))
</del><ins>+ if (!mimeType.isEmpty() && !avfMIMETypes().contains(mimeType))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>