<!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>[189725] releases/WebKitGTK/webkit-2.10/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/189725">189725</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-14 06:25:39 -0700 (Mon, 14 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189170">r189170</a> - [Freetype] FontCache::strengthOfFirstAlias leaks an FcPattern
https://bugs.webkit.org/show_bug.cgi?id=148624
Reviewed by Martin Robinson.
Using the normal RefPtr constructor causes the FcPattern to be reffed one extra time. Even
though the FcPattern is intentionally leaked to FcFontSetAdd down below, the FcPattern has
its own refcount and now it's screwed up. Just completely stop using RefPtr for these
FcPatterns, since the potential for confusion regarding leakRef combined with Fontconfig
refcounting far outweighs the benefit of using a smart pointer.
* platform/graphics/freetype/FontCacheFreeType.cpp:
(WebCore::strengthOfFirstAlias):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsfreetypeFontCacheFreeTypecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (189724 => 189725)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-09-14 13:22:08 UTC (rev 189724)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-09-14 13:25:39 UTC (rev 189725)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-31 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [Freetype] FontCache::strengthOfFirstAlias leaks an FcPattern
+ https://bugs.webkit.org/show_bug.cgi?id=148624
+
+ Reviewed by Martin Robinson.
+
+ Using the normal RefPtr constructor causes the FcPattern to be reffed one extra time. Even
+ though the FcPattern is intentionally leaked to FcFontSetAdd down below, the FcPattern has
+ its own refcount and now it's screwed up. Just completely stop using RefPtr for these
+ FcPatterns, since the potential for confusion regarding leakRef combined with Fontconfig
+ refcounting far outweighs the benefit of using a smart pointer.
+
+ * platform/graphics/freetype/FontCacheFreeType.cpp:
+ (WebCore::strengthOfFirstAlias):
+
</ins><span class="cx"> 2015-08-27 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Page does not update when <link> media attribute changes to no longer apply to page
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsfreetypeFontCacheFreeTypecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp (189724 => 189725)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2015-09-14 13:22:08 UTC (rev 189724)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2015-09-14 13:25:39 UTC (rev 189725)
</span><span class="lines">@@ -224,17 +224,19 @@
</span><span class="cx">
</span><span class="cx"> FcUniquePtr<FcLangSet> strongLangSet(FcLangSetCreate());
</span><span class="cx"> FcLangSetAdd(strongLangSet.get(), reinterpret_cast<const FcChar8*>("nomatchlang"));
</span><del>- RefPtr<FcPattern> strong = adoptRef(FcPatternDuplicate(pattern.get()));
- FcPatternAddLangSet(strong.get(), FC_LANG, strongLangSet.get());
</del><ins>+ // Ownership of this FcPattern will be transferred with FcFontSetAdd.
+ FcPattern* strong = FcPatternDuplicate(pattern.get());
+ FcPatternAddLangSet(strong, FC_LANG, strongLangSet.get());
</ins><span class="cx">
</span><span class="cx"> FcUniquePtr<FcLangSet> weakLangSet(FcLangSetCreate());
</span><span class="cx"> FcLangSetAdd(weakLangSet.get(), reinterpret_cast<const FcChar8*>("matchlang"));
</span><del>- RefPtr<FcPattern> weak(FcPatternCreate());
- FcPatternAddString(weak.get(), FC_FAMILY, reinterpret_cast<const FcChar8*>("nomatchstring"));
- FcPatternAddLangSet(weak.get(), FC_LANG, weakLangSet.get());
</del><ins>+ // Ownership of this FcPattern will be transferred via FcFontSetAdd.
+ FcPattern* weak = FcPatternCreate();
+ FcPatternAddString(weak, FC_FAMILY, reinterpret_cast<const FcChar8*>("nomatchstring"));
+ FcPatternAddLangSet(weak, FC_LANG, weakLangSet.get());
</ins><span class="cx">
</span><del>- FcFontSetAdd(fontSet.get(), strong.leakRef());
- FcFontSetAdd(fontSet.get(), weak.leakRef());
</del><ins>+ FcFontSetAdd(fontSet.get(), strong);
+ FcFontSetAdd(fontSet.get(), weak);
</ins><span class="cx">
</span><span class="cx"> // Add 'matchlang' to the copy of the pattern.
</span><span class="cx"> FcPatternAddLangSet(pattern.get(), FC_LANG, weakLangSet.get());
</span></span></pre>
</div>
</div>
</body>
</html>