<!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>[174665] 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/174665">174665</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-13 16:46:20 -0700 (Mon, 13 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Return value of createImageSourceOptions() is leaked in ImageSourceCG
https://bugs.webkit.org/show_bug.cgi?id=137677
Reviewed by Simon Fraser.
The return value of createImageSourceOptions() was leaked in
ImageSourceCG.cpp. It was returning a CFDictionaryRef created using
CFDictionaryCreate(). Therefore, the return value should have been
released but wasn't.
This patch makes createImageSourceOptions() return a
RetainPtr<CFDictionaryRef> to make sure the CFDictionaryRef properly
gets released after use.
No new tests, no behavior change.
* platform/graphics/cg/ImageSourceCG.cpp:
(WebCore::createImageSourceOptions):
(WebCore::imageSourceOptions):
(WebCore::ImageSource::isSizeAvailable):
(WebCore::ImageSource::allowSubsamplingOfFrameAtIndex):
(WebCore::ImageSource::frameSizeAtIndex):
(WebCore::ImageSource::orientationAtIndex):
(WebCore::ImageSource::getHotSpot):
(WebCore::ImageSource::repetitionCount):
(WebCore::ImageSource::createFrameAtIndex):
(WebCore::ImageSource::frameDurationAtIndex):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174664 => 174665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-13 23:10:20 UTC (rev 174664)
+++ trunk/Source/WebCore/ChangeLog 2014-10-13 23:46:20 UTC (rev 174665)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-10-13 Chris Dumez <cdumez@apple.com>
+
+ [Mac] Return value of createImageSourceOptions() is leaked in ImageSourceCG
+ https://bugs.webkit.org/show_bug.cgi?id=137677
+
+ Reviewed by Simon Fraser.
+
+ The return value of createImageSourceOptions() was leaked in
+ ImageSourceCG.cpp. It was returning a CFDictionaryRef created using
+ CFDictionaryCreate(). Therefore, the return value should have been
+ released but wasn't.
+
+ This patch makes createImageSourceOptions() return a
+ RetainPtr<CFDictionaryRef> to make sure the CFDictionaryRef properly
+ gets released after use.
+
+ No new tests, no behavior change.
+
+ * platform/graphics/cg/ImageSourceCG.cpp:
+ (WebCore::createImageSourceOptions):
+ (WebCore::imageSourceOptions):
+ (WebCore::ImageSource::isSizeAvailable):
+ (WebCore::ImageSource::allowSubsamplingOfFrameAtIndex):
+ (WebCore::ImageSource::frameSizeAtIndex):
+ (WebCore::ImageSource::orientationAtIndex):
+ (WebCore::ImageSource::getHotSpot):
+ (WebCore::ImageSource::repetitionCount):
+ (WebCore::ImageSource::createFrameAtIndex):
+ (WebCore::ImageSource::frameDurationAtIndex):
+
</ins><span class="cx"> 2014-10-13 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> CSS JIT: Implement :visited pseudo class
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp (174664 => 174665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-10-13 23:10:20 UTC (rev 174664)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-10-13 23:46:20 UTC (rev 174665)
</span><span class="lines">@@ -34,12 +34,13 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><ins>+#include <wtf/NeverDestroyed.h>
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #include <ApplicationServices/ApplicationServices.h>
</span><span class="cx"> #else
</span><span class="cx"> #include <CoreGraphics/CGImagePrivate.h>
</span><span class="cx"> #include <ImageIO/ImageIO.h>
</span><del>-#include <wtf/NeverDestroyed.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -106,7 +107,7 @@
</span><span class="cx"> setData(data, allDataReceived);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static CFDictionaryRef createImageSourceOptions(SubsamplingLevel subsamplingLevel)
</del><ins>+static RetainPtr<CFDictionaryRef> createImageSourceOptions(SubsamplingLevel subsamplingLevel)
</ins><span class="cx"> {
</span><span class="cx"> if (!subsamplingLevel) {
</span><span class="cx"> const unsigned numOptions = 3;
</span><span class="lines">@@ -122,15 +123,15 @@
</span><span class="cx"> const CFIndex numOptions = 4;
</span><span class="cx"> const void* keys[numOptions] = { kCGImageSourceShouldCache, kCGImageSourceShouldPreferRGB32, kCGImageSourceSkipMetadata, kCGImageSourceSubsampleFactor };
</span><span class="cx"> const void* values[numOptions] = { kCFBooleanTrue, kCFBooleanTrue, kCFBooleanTrue, subsampleNumber.get() };
</span><del>- return CFDictionaryCreate(nullptr, keys, values, numOptions, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</del><ins>+ return adoptCF(CFDictionaryCreate(nullptr, keys, values, numOptions, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static CFDictionaryRef imageSourceOptions(SubsamplingLevel subsamplingLevel = 0)
</del><ins>+static RetainPtr<CFDictionaryRef> imageSourceOptions(SubsamplingLevel subsamplingLevel = 0)
</ins><span class="cx"> {
</span><span class="cx"> if (subsamplingLevel)
</span><span class="cx"> return createImageSourceOptions(subsamplingLevel);
</span><span class="cx">
</span><del>- static CFDictionaryRef options = createImageSourceOptions(0);
</del><ins>+ static NeverDestroyed<RetainPtr<CFDictionaryRef>> options = createImageSourceOptions(0);
</ins><span class="cx"> return options;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -185,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> // Ragnaros yells: TOO SOON! You have awakened me TOO SOON, Executus!
</span><span class="cx"> if (imageSourceStatus >= kCGImageStatusIncomplete) {
</span><del>- RetainPtr<CFDictionaryRef> image0Properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, 0, imageSourceOptions()));
</del><ins>+ RetainPtr<CFDictionaryRef> image0Properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, 0, imageSourceOptions().get()));
</ins><span class="cx"> if (image0Properties) {
</span><span class="cx"> CFNumberRef widthNumber = (CFNumberRef)CFDictionaryGetValue(image0Properties.get(), kCGImagePropertyPixelWidth);
</span><span class="cx"> CFNumberRef heightNumber = (CFNumberRef)CFDictionaryGetValue(image0Properties.get(), kCGImagePropertyPixelHeight);
</span><span class="lines">@@ -210,7 +211,7 @@
</span><span class="cx">
</span><span class="cx"> bool ImageSource::allowSubsamplingOfFrameAtIndex(size_t) const
</span><span class="cx"> {
</span><del>- RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, 0, imageSourceOptions()));
</del><ins>+ RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, 0, imageSourceOptions().get()));
</ins><span class="cx"> if (!properties)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -232,7 +233,7 @@
</span><span class="cx">
</span><span class="cx"> IntSize ImageSource::frameSizeAtIndex(size_t index, SubsamplingLevel subsamplingLevel, ImageOrientationDescription description) const
</span><span class="cx"> {
</span><del>- RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, index, imageSourceOptions(subsamplingLevel)));
</del><ins>+ RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, index, imageSourceOptions(subsamplingLevel).get()));
</ins><span class="cx">
</span><span class="cx"> if (!properties)
</span><span class="cx"> return IntSize();
</span><span class="lines">@@ -254,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> ImageOrientation ImageSource::orientationAtIndex(size_t index) const
</span><span class="cx"> {
</span><del>- RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, index, imageSourceOptions()));
</del><ins>+ RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, index, imageSourceOptions().get()));
</ins><span class="cx"> if (!properties)
</span><span class="cx"> return DefaultImageOrientation;
</span><span class="cx">
</span><span class="lines">@@ -268,7 +269,7 @@
</span><span class="cx">
</span><span class="cx"> bool ImageSource::getHotSpot(IntPoint& hotSpot) const
</span><span class="cx"> {
</span><del>- RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, 0, imageSourceOptions()));
</del><ins>+ RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, 0, imageSourceOptions().get()));
</ins><span class="cx"> if (!properties)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -304,7 +305,7 @@
</span><span class="cx"> if (!initialized())
</span><span class="cx"> return cAnimationLoopOnce;
</span><span class="cx">
</span><del>- RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyProperties(m_decoder, imageSourceOptions()));
</del><ins>+ RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyProperties(m_decoder, imageSourceOptions().get()));
</ins><span class="cx"> if (!properties)
</span><span class="cx"> return cAnimationLoopOnce;
</span><span class="cx">
</span><span class="lines">@@ -348,7 +349,7 @@
</span><span class="cx"> if (!initialized())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- RetainPtr<CGImageRef> image = adoptCF(CGImageSourceCreateImageAtIndex(m_decoder, index, imageSourceOptions(subsamplingLevel)));
</del><ins>+ RetainPtr<CGImageRef> image = adoptCF(CGImageSourceCreateImageAtIndex(m_decoder, index, imageSourceOptions(subsamplingLevel).get()));
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // <rdar://problem/7371198> - CoreGraphics changed the default caching behaviour in iOS 4.0 to kCGImageCachingTransient
</span><span class="lines">@@ -391,7 +392,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> float duration = 0;
</span><del>- RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, index, imageSourceOptions()));
</del><ins>+ RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, index, imageSourceOptions().get()));
</ins><span class="cx"> if (properties) {
</span><span class="cx"> CFDictionaryRef gifProperties = (CFDictionaryRef)CFDictionaryGetValue(properties.get(), kCGImagePropertyGIFDictionary);
</span><span class="cx"> if (gifProperties) {
</span></span></pre>
</div>
</div>
</body>
</html>