<!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>[178853] 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/178853">178853</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 11:33:14 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/178180">r178180</a>): Membuster regressed ~4%
https://bugs.webkit.org/show_bug.cgi?id=140495
Reviewed by Andreas Kling.
After <a href="http://trac.webkit.org/projects/webkit/changeset/178180">r178180</a> we keep system fallback fonts that are used on glyph pages alive.
Previously we would traverse the glyph pages and remove entries referencing system fallbacks.
* platform/graphics/FontCache.cpp:
(WebCore::FontCache::purgeInactiveFontData):
* platform/graphics/FontCascade.cpp:
(WebCore::pruneUnreferencedEntriesFromFontGlyphsCache):
(WebCore::pruneSystemFallbackFonts):
* platform/graphics/FontCascade.h:
* platform/graphics/FontGlyphs.cpp:
(WebCore::FontGlyphs::pruneSystemFallbacks):
When clearing the font cache also remove the cached glyph pages that may contain system fallback fonts
and release the fallbacks.
* platform/graphics/FontGlyphs.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontGlyphscpp">trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontGlyphsh">trunk/Source/WebCore/platform/graphics/FontGlyphs.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178852 => 178853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-21 19:31:40 UTC (rev 178852)
+++ trunk/Source/WebCore/ChangeLog 2015-01-21 19:33:14 UTC (rev 178853)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-01-20 Antti Koivisto <antti@apple.com>
+
+ REGRESSION(r178180): Membuster regressed ~4%
+ https://bugs.webkit.org/show_bug.cgi?id=140495
+
+ Reviewed by Andreas Kling.
+
+ After r178180 we keep system fallback fonts that are used on glyph pages alive.
+ Previously we would traverse the glyph pages and remove entries referencing system fallbacks.
+
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::purgeInactiveFontData):
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::pruneUnreferencedEntriesFromFontGlyphsCache):
+ (WebCore::pruneSystemFallbackFonts):
+ * platform/graphics/FontCascade.h:
+ * platform/graphics/FontGlyphs.cpp:
+ (WebCore::FontGlyphs::pruneSystemFallbacks):
+
+ When clearing the font cache also remove the cached glyph pages that may contain system fallback fonts
+ and release the fallbacks.
+
+ * platform/graphics/FontGlyphs.h:
+
</ins><span class="cx"> 2015-01-21 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> first-letter pseudo-element from ancestors is not being ignored in grids and flexboxes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (178852 => 178853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2015-01-21 19:31:40 UTC (rev 178852)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2015-01-21 19:33:14 UTC (rev 178853)
</span><span class="lines">@@ -427,6 +427,7 @@
</span><span class="cx"> void FontCache::purgeInactiveFontData(int purgeCount)
</span><span class="cx"> {
</span><span class="cx"> pruneUnreferencedEntriesFromFontGlyphsCache();
</span><ins>+ pruneSystemFallbackFonts();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> FontLocker fontLocker;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (178852 => 178853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-01-21 19:31:40 UTC (rev 178852)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-01-21 19:33:14 UTC (rev 178853)
</span><span class="lines">@@ -287,16 +287,17 @@
</span><span class="cx">
</span><span class="cx"> void pruneUnreferencedEntriesFromFontGlyphsCache()
</span><span class="cx"> {
</span><del>- Vector<unsigned, 50> toRemove;
- FontGlyphsCache::iterator end = fontGlyphsCache().end();
- for (FontGlyphsCache::iterator it = fontGlyphsCache().begin(); it != end; ++it) {
- if (it->value->glyphs.get().hasOneRef())
- toRemove.append(it->key);
- }
- for (unsigned i = 0; i < toRemove.size(); ++i)
- fontGlyphsCache().remove(toRemove[i]);
</del><ins>+ fontGlyphsCache().removeIf([](FontGlyphsCache::KeyValuePairType& entry) {
+ return entry.value->glyphs.get().hasOneRef();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void pruneSystemFallbackFonts()
+{
+ for (auto& entry : fontGlyphsCache().values())
+ entry->glyphs->pruneSystemFallbacks();
+}
+
</ins><span class="cx"> static Ref<FontGlyphs> retrieveOrAddCachedFontGlyphs(const FontDescription& fontDescription, PassRefPtr<FontSelector> fontSelector)
</span><span class="cx"> {
</span><span class="cx"> FontGlyphsCacheKey key;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (178852 => 178853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-01-21 19:31:40 UTC (rev 178852)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-01-21 19:33:14 UTC (rev 178853)
</span><span class="lines">@@ -345,6 +345,7 @@
</span><span class="cx">
</span><span class="cx"> void invalidateFontGlyphsCache();
</span><span class="cx"> void pruneUnreferencedEntriesFromFontGlyphsCache();
</span><ins>+void pruneSystemFallbackFonts();
</ins><span class="cx"> void clearWidthCaches();
</span><span class="cx">
</span><span class="cx"> inline FontCascade::~FontCascade()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp (178852 => 178853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2015-01-21 19:31:40 UTC (rev 178852)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2015-01-21 19:33:14 UTC (rev 178853)
</span><span class="lines">@@ -392,4 +392,17 @@
</span><span class="cx"> return glyphData;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FontGlyphs::pruneSystemFallbacks()
+{
+ if (m_systemFallbackFontDataSet.isEmpty())
+ return;
+ // Mutable glyph pages may reference fallback fonts.
+ if (m_cachedPageZero && !m_cachedPageZero->isImmutable())
+ m_cachedPageZero = nullptr;
+ m_cachedPages.removeIf([](decltype(m_cachedPages)::KeyValuePairType& keyAndValue) {
+ return !keyAndValue.value->isImmutable();
+ });
+ m_systemFallbackFontDataSet.clear();
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.h (178852 => 178853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.h 2015-01-21 19:31:40 UTC (rev 178852)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.h 2015-01-21 19:33:14 UTC (rev 178853)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx"> const SimpleFontData& primarySimpleFontData(const FontDescription&);
</span><span class="cx"> WEBCORE_EXPORT const FontRanges& realizeFallbackRangesAt(const FontDescription&, unsigned fallbackIndex);
</span><span class="cx">
</span><ins>+ void pruneSystemFallbacks();
+
</ins><span class="cx"> private:
</span><span class="cx"> FontGlyphs(PassRefPtr<FontSelector>);
</span><span class="cx"> FontGlyphs(const FontPlatformData&);
</span></span></pre>
</div>
</div>
</body>
</html>