<!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>[167746] 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/167746">167746</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-23 21:46:28 -0700 (Wed, 23 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] fix CF leaks found by code inspection
https://bugs.webkit.org/show_bug.cgi?id=132106
Reviewed by Andreas Kling.
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::trackDisplayName): Added a missing adoptCF.
* platform/Language.cpp:
(WebCore::displayNameForLanguageLocale): Added a missing adoptCF.
* platform/graphics/FontPlatformData.cpp:
(WebCore::FontPlatformData::openTypeTable): Added a missing adoptCF.
* platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp:
(WebCore::InbandTextTrackPrivateAVCF::label): Added two missing adoptCF.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::AVFWrapper::createImageForTimeInRect): Added two missing adoptCF.
* platform/graphics/cg/PDFDocumentImage.cpp:
(WebCore::PDFDocumentImage::createPDFDocument): Added missing adoptCF.
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::cascadeToLastResortFontDescriptor): Added two missing adoptCF.
* platform/graphics/mac/FontMac.mm:
(WebCore::Font::primaryFontDataIsSystemFont): Added missing adoptCF.
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::hasCustomTracking): Added missing adoptCF.
* platform/image-decoders/ImageDecoder.h:
(WebCore::ImageDecoder::qcmsOutputDeviceProfile): Added CFRelease.
* plugins/mac/PluginPackageMac.cpp:
(WebCore::readPListFile): Added two missing adoptCF.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLanguagecpp">trunk/Source/WebCore/platform/Language.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatacpp">trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfInbandTextTrackPrivateAVCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPDFDocumentImagecpp">trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontMacmm">trunk/Source/WebCore/platform/graphics/mac/FontMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm">trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersImageDecoderh">trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h</a></li>
<li><a href="#trunkSourceWebCorepluginsmacPluginPackageMaccpp">trunk/Source/WebCore/plugins/mac/PluginPackageMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2014-04-23 Darin Adler <darin@apple.com>
+
+ [Cocoa] fix CF leaks found by code inspection
+ https://bugs.webkit.org/show_bug.cgi?id=132106
+
+ Reviewed by Andreas Kling.
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::trackDisplayName): Added a missing adoptCF.
+
+ * platform/Language.cpp:
+ (WebCore::displayNameForLanguageLocale): Added a missing adoptCF.
+
+ * platform/graphics/FontPlatformData.cpp:
+ (WebCore::FontPlatformData::openTypeTable): Added a missing adoptCF.
+
+ * platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp:
+ (WebCore::InbandTextTrackPrivateAVCF::label): Added two missing adoptCF.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::AVFWrapper::createImageForTimeInRect): Added two missing adoptCF.
+
+ * platform/graphics/cg/PDFDocumentImage.cpp:
+ (WebCore::PDFDocumentImage::createPDFDocument): Added missing adoptCF.
+
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::cascadeToLastResortFontDescriptor): Added two missing adoptCF.
+
+ * platform/graphics/mac/FontMac.mm:
+ (WebCore::Font::primaryFontDataIsSystemFont): Added missing adoptCF.
+
+ * platform/graphics/mac/SimpleFontDataMac.mm:
+ (WebCore::hasCustomTracking): Added missing adoptCF.
+
+ * platform/image-decoders/ImageDecoder.h:
+ (WebCore::ImageDecoder::qcmsOutputDeviceProfile): Added CFRelease.
+
+ * plugins/mac/PluginPackageMac.cpp:
+ (WebCore::readPListFile): Added two missing adoptCF.
+
</ins><span class="cx"> 2014-04-23 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r157328): popover to check into flight ba.com dismisses instantly when focusing form
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -608,7 +608,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- String languageAndLocale = CFLocaleCopyDisplayNameForPropertyValue(currentLocale.get(), kCFLocaleIdentifier, trackLanguageIdentifier.createCFString().get());
</del><ins>+ String languageAndLocale = adoptCF(CFLocaleCopyDisplayNameForPropertyValue(currentLocale.get(), kCFLocaleIdentifier, trackLanguageIdentifier.createCFString().get())).get();
</ins><span class="cx"> if (!languageAndLocale.isEmpty())
</span><span class="cx"> displayName.append(languageAndLocale);
</span><span class="cx"> else if (!language.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLanguagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Language.cpp (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Language.cpp 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/platform/Language.cpp 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -148,10 +148,8 @@
</span><span class="cx"> String displayNameForLanguageLocale(const String& localeName)
</span><span class="cx"> {
</span><span class="cx"> #if USE(CF) && !PLATFORM(WIN)
</span><del>- if (!localeName.isNull() && !localeName.isEmpty()) {
- RetainPtr<CFLocaleRef> currentLocale = adoptCF(CFLocaleCopyCurrent());
- return CFLocaleCopyDisplayNameForPropertyValue(currentLocale.get(), kCFLocaleIdentifier, localeName.createCFString().get());
- }
</del><ins>+ if (!localeName.isEmpty())
+ return adoptCF(CFLocaleCopyDisplayNameForPropertyValue(adoptCF(CFLocaleCopyCurrent()).get(), kCFLocaleIdentifier, localeName.createCFString().get())).get();
</ins><span class="cx"> #endif
</span><span class="cx"> return localeName;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx"> #if OS(DARWIN) && USE(CG)
</span><span class="cx"> PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
</span><span class="cx"> {
</span><del>- if (CFDataRef data = CGFontCopyTableForTag(cgFont(), table))
- return SharedBuffer::wrapCFData(data);
</del><ins>+ if (RetainPtr<CFDataRef> data = adoptCF(CGFontCopyTableForTag(cgFont(), table)))
+ return SharedBuffer::wrapCFData(data.get());
</ins><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfInbandTextTrackPrivateAVCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -148,8 +148,8 @@
</span><span class="cx"> return emptyAtom;
</span><span class="cx">
</span><span class="cx"> // If possible, return a title in one of the user's preferred languages.
</span><del>- RetainPtr<CFArrayRef> preferredLanguages = CFLocaleCopyPreferredLanguages();
- RetainPtr<CFArrayRef> titlesForPreferredLanguages = AVCFMediaSelectionCopyOptionsFromArrayFilteredAndSortedAccordingToPreferredLanguages(titles.get(), preferredLanguages.get());
</del><ins>+ RetainPtr<CFArrayRef> preferredLanguages = adoptCF(CFLocaleCopyPreferredLanguages());
+ RetainPtr<CFArrayRef> titlesForPreferredLanguages = adoptCF(AVCFMediaSelectionCopyOptionsFromArrayFilteredAndSortedAccordingToPreferredLanguages(titles.get(), preferredLanguages.get()));
</ins><span class="cx"> CFIndex preferredTitlesCount = CFArrayGetCount(titlesForPreferredLanguages.get());
</span><span class="cx"> if (preferredTitlesCount) {
</span><span class="cx"> AVCFMetadataItemRef titleMetadata = static_cast<AVCFMetadataItemRef>(CFArrayGetValueAtIndex(titlesForPreferredLanguages.get(), 0));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -1757,8 +1757,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> AVCFAssetImageGeneratorSetMaximumSize(m_imageGenerator.get(), CGSize(rect.size()));
</span><del>- CGImageRef rawimage = AVCFAssetImageGeneratorCopyCGImageAtTime(m_imageGenerator.get(), CMTimeMakeWithSeconds(time, 600), 0, 0);
- CGImageRef image = CGImageCreateCopyWithColorSpace(rawimage, CGColorSpaceCreateDeviceRGB());
</del><ins>+ RetainPtr<CGImageRef> rawimage = adoptCF(AVCFAssetImageGeneratorCopyCGImageAtTime(m_imageGenerator.get(), CMTimeMakeWithSeconds(time, 600), 0, 0));
+ RetainPtr<CGImageRef> image = adoptCF(CGImageCreateCopyWithColorSpace(rawimage.get(), adoptCF(CGColorSpaceCreateDeviceRGB()).get()));
+
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> double duration = monotonicallyIncreasingTime() - start;
</span><span class="cx"> LOG(Media, "AVFWrapper::createImageForTimeInRect(%p) - creating image took %.4f", this, narrowPrecisionToFloat(duration));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPDFDocumentImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -209,10 +209,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !USE(PDFKIT_FOR_PDFDOCUMENTIMAGE)
</span><ins>+
</ins><span class="cx"> void PDFDocumentImage::createPDFDocument()
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CGDataProviderRef> dataProvider = adoptCF(CGDataProviderCreateWithCFData(data()->createCFData().get()));
</span><del>- m_document = CGPDFDocumentCreateWithProvider(dataProvider.get());
</del><ins>+ m_document = adoptCF(CGPDFDocumentCreateWithProvider(dataProvider.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PDFDocumentImage::computeBoundsForCurrentPage()
</span><span class="lines">@@ -256,6 +257,7 @@
</span><span class="cx"> // CGPDF pages are indexed from 1.
</span><span class="cx"> CGContextDrawPDFPage(context->platformContext(), CGPDFDocumentGetPage(m_document.get(), 1));
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif // !USE(PDFKIT_FOR_PDFDOCUMENTIMAGE)
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -272,9 +272,13 @@
</span><span class="cx"> if (descriptor)
</span><span class="cx"> return descriptor;
</span><span class="cx">
</span><ins>+ RetainPtr<CTFontDescriptorRef> lastResort = adoptCF(CTFontDescriptorCreateWithNameAndSize(CFSTR("LastResort"), 0));
+
+ const void* descriptors[] = { lastResort.get() };
+ RetainPtr<CFArrayRef> array = adoptCF(CFArrayCreate(kCFAllocatorDefault, descriptors, WTF_ARRAY_LENGTH(descriptors), &kCFTypeArrayCallBacks));
+
</ins><span class="cx"> const void* keys[] = { kCTFontCascadeListAttribute };
</span><del>- const void* descriptors[] = { CTFontDescriptorCreateWithNameAndSize(CFSTR("LastResort"), 0) };
- const void* values[] = { CFArrayCreate(kCFAllocatorDefault, descriptors, WTF_ARRAY_LENGTH(descriptors), &kCFTypeArrayCallBacks) };
</del><ins>+ const void* values[] = { array.get() };
</ins><span class="cx"> RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><span class="cx">
</span><span class="cx"> descriptor = CTFontDescriptorCreateWithAttributes(attributes.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -543,8 +543,7 @@
</span><span class="cx"> bool Font::primaryFontDataIsSystemFont() const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
</span><del>- RetainPtr<CTFontDescriptorRef> descriptor = CTFontCopyFontDescriptor(primaryFont()->platformData().ctFont());
- return CTFontDescriptorIsSystemUIFont(descriptor.get());
</del><ins>+ return CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(primaryFont()->platformData().ctFont())).get());
</ins><span class="cx"> #else
</span><span class="cx"> // System fonts are hidden by having a name that begins with a period, so simply search
</span><span class="cx"> // for that here rather than try to keep the list up to date.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -372,8 +372,7 @@
</span><span class="cx"> UNUSED_PARAM(font);
</span><span class="cx"> return false;
</span><span class="cx"> #else
</span><del>- RetainPtr<CTFontDescriptorRef> descriptor = CTFontCopyFontDescriptor(font);
- return CTFontDescriptorIsSystemUIFont(descriptor.get());
</del><ins>+ return CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(font)).get());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersImageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -320,6 +320,7 @@
</span><span class="cx"> size_t length = CFDataGetLength(iccProfile);
</span><span class="cx"> const unsigned char* systemProfile = CFDataGetBytePtr(iccProfile);
</span><span class="cx"> outputDeviceProfile = qcms_profile_from_memory(systemProfile, length);
</span><ins>+ CFRelease(iccProfile);
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> // FIXME: add support for multiple monitors.
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsmacPluginPackageMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/mac/PluginPackageMac.cpp (167745 => 167746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/mac/PluginPackageMac.cpp 2014-04-24 04:42:32 UTC (rev 167745)
+++ trunk/Source/WebCore/plugins/mac/PluginPackageMac.cpp 2014-04-24 04:46:28 UTC (rev 167746)
</span><span class="lines">@@ -28,16 +28,15 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PluginPackage.h"
</span><span class="cx">
</span><del>-#include <wtf/RetainPtr.h>
</del><span class="cx"> #include "MIMETypeRegistry.h"
</span><del>-#include "npruntime_impl.h"
</del><span class="cx"> #include "PluginDatabase.h"
</span><span class="cx"> #include "PluginDebug.h"
</span><span class="cx"> #include "WebCoreNSStringExtras.h"
</span><ins>+#include "npruntime_impl.h"
+#include <CoreFoundation/CoreFoundation.h>
+#include <wtf/RetainPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#include <CoreFoundation/CoreFoundation.h>
-
</del><span class="cx"> #define PluginNameOrDescriptionStringNumber 126
</span><span class="cx"> #define MIMEDescriptionStringNumber 127
</span><span class="cx"> #define MIMEListStringStringNumber 128
</span><span class="lines">@@ -67,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> typedef void (*BP_CreatePluginMIMETypesPreferencesFuncPtr)(void);
</span><span class="cx">
</span><del>-static WTF::RetainPtr<CFDictionaryRef> readPListFile(CFStringRef fileName, bool createFile, CFBundleRef bundle)
</del><ins>+static RetainPtr<CFDictionaryRef> readPListFile(CFStringRef fileName, bool createFile, CFBundleRef bundle)
</ins><span class="cx"> {
</span><span class="cx"> if (createFile) {
</span><span class="cx"> BP_CreatePluginMIMETypesPreferencesFuncPtr funcPtr =
</span><span class="lines">@@ -76,17 +75,15 @@
</span><span class="cx"> funcPtr();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WTF::RetainPtr<CFDictionaryRef> map;
- WTF::RetainPtr<CFURLRef> url =
- CFURLCreateWithFileSystemPath(kCFAllocatorDefault, fileName, kCFURLPOSIXPathStyle, false);
</del><ins>+ RetainPtr<CFDictionaryRef> map;
+ RetainPtr<CFURLRef> url = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, fileName, kCFURLPOSIXPathStyle, false));
</ins><span class="cx">
</span><span class="cx"> CFDataRef resource = 0;
</span><span class="cx"> SInt32 code;
</span><span class="cx"> if (!CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, url.get(), &resource, 0, 0, &code))
</span><span class="cx"> return map;
</span><span class="cx">
</span><del>- WTF::RetainPtr<CFPropertyListRef> propertyList =
- CFPropertyListCreateFromXMLData(kCFAllocatorDefault, resource, kCFPropertyListImmutable, 0);
</del><ins>+ RetainPtr<CFPropertyListRef> propertyList = adoptCF(CFPropertyListCreateFromXMLData(kCFAllocatorDefault, resource, kCFPropertyListImmutable, 0));
</ins><span class="cx">
</span><span class="cx"> CFRelease(resource);
</span><span class="cx">
</span><span class="lines">@@ -119,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> for (SInt16 i = 0; i < count; ++i) {
</span><span class="cx"> unsigned char length = *p;
</span><del>- WTF::RetainPtr<CFStringRef> str = adoptCF(CFStringCreateWithPascalString(0, p, encoding));
</del><ins>+ RetainPtr<CFStringRef> str = adoptCF(CFStringCreateWithPascalString(0, p, encoding));
</ins><span class="cx"> list.append(str.get());
</span><span class="cx"> p += 1 + length;
</span><span class="cx"> }
</span><span class="lines">@@ -132,19 +129,19 @@
</span><span class="cx"> if (!load())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- WTF::RetainPtr<CFDictionaryRef> mimeDict;
</del><ins>+ RetainPtr<CFDictionaryRef> mimeDict;
</ins><span class="cx">
</span><del>- WTF::RetainPtr<CFTypeRef> mimeTypesFileName = CFBundleGetValueForInfoDictionaryKey(m_module, CFSTR("WebPluginMIMETypesFilename"));
</del><ins>+ RetainPtr<CFTypeRef> mimeTypesFileName = CFBundleGetValueForInfoDictionaryKey(m_module, CFSTR("WebPluginMIMETypesFilename"));
</ins><span class="cx"> if (mimeTypesFileName && CFGetTypeID(mimeTypesFileName.get()) == CFStringGetTypeID()) {
</span><span class="cx">
</span><del>- WTF::RetainPtr<CFStringRef> fileName = (CFStringRef)mimeTypesFileName.get();
- WTF::RetainPtr<CFStringRef> homeDir = adoptCF(homeDirectoryPath().createCFString());
- WTF::RetainPtr<CFStringRef> path = adoptCF(CFStringCreateWithFormat(0, 0, CFSTR("%@/Library/Preferences/%@"), homeDir.get(), fileName.get()));
</del><ins>+ RetainPtr<CFStringRef> fileName = (CFStringRef)mimeTypesFileName.get();
+ RetainPtr<CFStringRef> homeDir = homeDirectoryPath().createCFString();
+ RetainPtr<CFStringRef> path = adoptCF(CFStringCreateWithFormat(0, 0, CFSTR("%@/Library/Preferences/%@"), homeDir.get(), fileName.get()));
</ins><span class="cx">
</span><del>- WTF::RetainPtr<CFDictionaryRef> plist = readPListFile(path.get(), /*createFile*/ false, m_module);
</del><ins>+ RetainPtr<CFDictionaryRef> plist = readPListFile(path.get(), /*createFile*/ false, m_module);
</ins><span class="cx"> if (plist) {
</span><span class="cx"> // If the plist isn't localized, have the plug-in recreate it in the preferred language.
</span><del>- WTF::RetainPtr<CFStringRef> localizationName =
</del><ins>+ RetainPtr<CFStringRef> localizationName =
</ins><span class="cx"> (CFStringRef)CFDictionaryGetValue(plist.get(), CFSTR("WebPluginLocalizationName"));
</span><span class="cx"> CFLocaleRef locale = CFLocaleCopyCurrent();
</span><span class="cx"> if (localizationName != CFLocaleGetIdentifier(locale))
</span><span class="lines">@@ -172,9 +169,9 @@
</span><span class="cx"> String mimeType = (CFStringRef)keys[i];
</span><span class="cx"> mimeType = mimeType.lower();
</span><span class="cx">
</span><del>- WTF::RetainPtr<CFDictionaryRef> extensionsDict = (CFDictionaryRef)values[i];
</del><ins>+ RetainPtr<CFDictionaryRef> extensionsDict = (CFDictionaryRef)values[i];
</ins><span class="cx">
</span><del>- WTF::RetainPtr<CFNumberRef> enabled = (CFNumberRef)CFDictionaryGetValue(extensionsDict.get(), CFSTR("WebPluginTypeEnabled"));
</del><ins>+ RetainPtr<CFNumberRef> enabled = (CFNumberRef)CFDictionaryGetValue(extensionsDict.get(), CFSTR("WebPluginTypeEnabled"));
</ins><span class="cx"> if (enabled) {
</span><span class="cx"> int enabledValue = 0;
</span><span class="cx"> if (CFNumberGetValue(enabled.get(), kCFNumberIntType, &enabledValue) && enabledValue == 0)
</span><span class="lines">@@ -182,7 +179,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> mimeExtensions;
</span><del>- WTF::RetainPtr<CFArrayRef> extensions = (CFArrayRef)CFDictionaryGetValue(extensionsDict.get(), CFSTR("WebPluginExtensions"));
</del><ins>+ RetainPtr<CFArrayRef> extensions = (CFArrayRef)CFDictionaryGetValue(extensionsDict.get(), CFSTR("WebPluginExtensions"));
</ins><span class="cx"> if (extensions) {
</span><span class="cx"> CFIndex extensionCount = CFArrayGetCount(extensions.get());
</span><span class="cx"> for (CFIndex i = 0; i < extensionCount; ++i) {
</span><span class="lines">@@ -255,8 +252,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WTF::RetainPtr<CFStringRef> path = adoptCF(m_path.createCFString());
- WTF::RetainPtr<CFURLRef> url = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path.get(),
</del><ins>+ RetainPtr<CFStringRef> path = m_path.createCFString();
+ RetainPtr<CFURLRef> url = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path.get(),
</ins><span class="cx"> kCFURLPOSIXPathStyle, false));
</span><span class="cx"> m_module = CFBundleCreate(NULL, url.get());
</span><span class="cx"> if (!m_module || !CFBundleLoadExecutable(m_module)) {
</span></span></pre>
</div>
</div>
</body>
</html>