<!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>[180561] 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/180561">180561</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 08:46:18 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Break internal reference cycle in WebCore::Font.
<https://webkit.org/b/141941>
<rdar://problem/19650570>
Reviewed by Antti Koivisto.
The Cocoa implementation of Font::platformCreateScaledFont() tried to be smart and use the FontCache.
This didn't work out well when scaling a 0pt Font, since scaling 0pt by any factor will return 0pt.
We'd have a 0pt font, scale it by 0.7 to get a small-caps variant, and then cache that small-caps
variant (really "this") in Font::m_derivedData->smallCaps.
Fix this by having Cocoa Font scaling do exactly what other platforms do: create a new Font every time.
This stops us from accumulating tons of abandoned Font objects over time.
* platform/graphics/Font.cpp:
(WebCore::Font::verticalRightOrientationFont):
(WebCore::Font::uprightOrientationFont):
(WebCore::Font::smallCapsFont):
(WebCore::Font::emphasisMarkFont):
(WebCore::Font::brokenIdeographFont):
(WebCore::Font::nonSyntheticItalicFont): Add assertions to guard against reference cycles inside a Font.
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::Font::platformCreateScaledFont): Always create a new Font when scaling an existing Font to a different size.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180560 => 180561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-24 15:32:32 UTC (rev 180560)
+++ trunk/Source/WebCore/ChangeLog 2015-02-24 16:46:18 UTC (rev 180561)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-02-24 Andreas Kling <akling@apple.com>
+
+ [Cocoa] Break internal reference cycle in WebCore::Font.
+ <https://webkit.org/b/141941>
+ <rdar://problem/19650570>
+
+ Reviewed by Antti Koivisto.
+
+ The Cocoa implementation of Font::platformCreateScaledFont() tried to be smart and use the FontCache.
+ This didn't work out well when scaling a 0pt Font, since scaling 0pt by any factor will return 0pt.
+
+ We'd have a 0pt font, scale it by 0.7 to get a small-caps variant, and then cache that small-caps
+ variant (really "this") in Font::m_derivedData->smallCaps.
+
+ Fix this by having Cocoa Font scaling do exactly what other platforms do: create a new Font every time.
+ This stops us from accumulating tons of abandoned Font objects over time.
+
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::verticalRightOrientationFont):
+ (WebCore::Font::uprightOrientationFont):
+ (WebCore::Font::smallCapsFont):
+ (WebCore::Font::emphasisMarkFont):
+ (WebCore::Font::brokenIdeographFont):
+ (WebCore::Font::nonSyntheticItalicFont): Add assertions to guard against reference cycles inside a Font.
+
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::platformCreateScaledFont): Always create a new Font when scaling an existing Font to a different size.
+
</ins><span class="cx"> 2015-02-24 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] Reading ReadableStream ready and closed attributes should not always create a new promise
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (180560 => 180561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-02-24 15:32:32 UTC (rev 180560)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-02-24 16:46:18 UTC (rev 180561)
</span><span class="lines">@@ -287,6 +287,7 @@
</span><span class="cx"> verticalRightPlatformData.setOrientation(Horizontal);
</span><span class="cx"> m_derivedFontData->verticalRightOrientation = create(verticalRightPlatformData, isCustomFont(), false, true);
</span><span class="cx"> }
</span><ins>+ ASSERT(m_derivedFontData->verticalRightOrientation != this);
</ins><span class="cx"> return m_derivedFontData->verticalRightOrientation;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -296,6 +297,7 @@
</span><span class="cx"> m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
</span><span class="cx"> if (!m_derivedFontData->uprightOrientation)
</span><span class="cx"> m_derivedFontData->uprightOrientation = create(m_platformData, isCustomFont(), false, true);
</span><ins>+ ASSERT(m_derivedFontData->uprightOrientation != this);
</ins><span class="cx"> return m_derivedFontData->uprightOrientation;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -305,7 +307,7 @@
</span><span class="cx"> m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
</span><span class="cx"> if (!m_derivedFontData->smallCaps)
</span><span class="cx"> m_derivedFontData->smallCaps = createScaledFont(fontDescription, smallCapsFontSizeMultiplier);
</span><del>-
</del><ins>+ ASSERT(m_derivedFontData->smallCaps != this);
</ins><span class="cx"> return m_derivedFontData->smallCaps;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -315,7 +317,7 @@
</span><span class="cx"> m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
</span><span class="cx"> if (!m_derivedFontData->emphasisMark)
</span><span class="cx"> m_derivedFontData->emphasisMark = createScaledFont(fontDescription, emphasisMarkFontSizeMultiplier);
</span><del>-
</del><ins>+ ASSERT(m_derivedFontData->emphasisMark != this);
</ins><span class="cx"> return m_derivedFontData->emphasisMark;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -327,6 +329,7 @@
</span><span class="cx"> m_derivedFontData->brokenIdeograph = create(m_platformData, isCustomFont(), false);
</span><span class="cx"> m_derivedFontData->brokenIdeograph->m_isBrokenIdeographFallback = true;
</span><span class="cx"> }
</span><ins>+ ASSERT(m_derivedFontData->brokenIdeograph != this);
</ins><span class="cx"> return m_derivedFontData->brokenIdeograph;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -341,6 +344,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> m_derivedFontData->nonSyntheticItalic = create(nonSyntheticItalicFontPlatformData, isCustomFont());
</span><span class="cx"> }
</span><ins>+ ASSERT(m_derivedFontData->nonSyntheticItalic != this);
</ins><span class="cx"> return m_derivedFontData->nonSyntheticItalic;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (180560 => 180561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-02-24 15:32:32 UTC (rev 180560)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-02-24 16:46:18 UTC (rev 180561)
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> scaledFontData.m_syntheticBold = (fontTraits & NSBoldFontMask) && !(scaledFontTraits & NSBoldFontMask);
</span><span class="cx"> scaledFontData.m_syntheticOblique = (fontTraits & NSItalicFontMask) && !(scaledFontTraits & NSItalicFontMask);
</span><span class="cx">
</span><del>- return FontCache::singleton().fontForPlatformData(scaledFontData);
</del><ins>+ return Font::create(scaledFontData);
</ins><span class="cx"> }
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> scaledFontData.m_syntheticBold = (fontTraits & kCTFontBoldTrait) && !(scaledFontTraits & kCTFontTraitBold);
</span><span class="cx"> scaledFontData.m_syntheticOblique = (fontTraits & kCTFontItalicTrait) && !(scaledFontTraits & kCTFontTraitItalic);
</span><span class="cx">
</span><del>- return FontCache::singleton().fontForPlatformData(scaledFontData);
</del><ins>+ return Font::create(scaledFontData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>