<!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>[180281] trunk/Source</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/180281">180281</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 12:05:11 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Access FontCache global instance via singleton() static member function
https://bugs.webkit.org/show_bug.cgi?id=141726
Reviewed by Daniel Bates.
Access FontCache global instance via singleton() static member function,
as per coding style.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSourcecpp">trunk/Source/WebCore/css/CSSFontFaceSource.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontGlyphscpp">trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm">trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm">trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCacheWincpp">trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCoreStatisticsmm">trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreStatisticscpp">trunk/Source/WebKit/win/WebCoreStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/ChangeLog 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-18 Chris Dumez <cdumez@apple.com>
+
+ Access FontCache global instance via singleton() static member function
+ https://bugs.webkit.org/show_bug.cgi?id=141726
+
+ Reviewed by Daniel Bates.
+
+ Access FontCache global instance via singleton() static member function,
+ as per coding style.
+
</ins><span class="cx"> 2015-02-18 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Crashes under IDBDatabase::closeConnection.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> {
</span><span class="cx"> // If the font hasn't loaded or an error occurred, then we've got nothing.
</span><span class="cx"> if (!isValid())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!m_font
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> ) {
</span><span class="cx"> // We're local. Just return a Font from the normal cache.
</span><span class="cx"> // We don't want to check alternate font family names here, so pass true as the checkingAlternateName parameter.
</span><del>- return fontCache().fontForFamily(fontDescription, m_string, true);
</del><ins>+ return FontCache::singleton().fontForFamily(fontDescription, m_string, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned hashKey = (fontDescription.computedPixelSize() + 1) << 5 | fontDescription.widthVariant() << 3
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> // and the loader may invoke arbitrary delegate or event handler code.
</span><span class="cx"> fontSelector->beginLoadingFontSoon(m_font.get());
</span><span class="cx">
</span><del>- Ref<Font> placeholderFont = fontCache().lastResortFallbackFont(fontDescription);
</del><ins>+ Ref<Font> placeholderFont = FontCache::singleton().lastResortFallbackFont(fontDescription);
</ins><span class="cx"> Ref<Font> placeholderFontCopyInLoadingState = Font::create(placeholderFont->platformData(), true, true);
</span><span class="cx"> return WTF::move(placeholderFontCopyInLoadingState);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -70,13 +70,13 @@
</span><span class="cx"> // seem to be any such guarantee.
</span><span class="cx">
</span><span class="cx"> ASSERT(m_document);
</span><del>- fontCache().addClient(this);
</del><ins>+ FontCache::singleton().addClient(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSFontSelector::~CSSFontSelector()
</span><span class="cx"> {
</span><span class="cx"> clearDocument();
</span><del>- fontCache().removeClient(this);
</del><ins>+ FontCache::singleton().removeClient(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSFontSelector::isEmpty() const
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> ASSERT(!m_locallyInstalledFontFaces.contains(familyName));
</span><span class="cx">
</span><span class="cx"> Vector<unsigned> locallyInstalledFontsTraitsMasks;
</span><del>- fontCache().getTraitsInFamily(familyName, locallyInstalledFontsTraitsMasks);
</del><ins>+ FontCache::singleton().getTraitsInFamily(familyName, locallyInstalledFontsTraitsMasks);
</ins><span class="cx"> if (unsigned numLocallyInstalledFaces = locallyInstalledFontsTraitsMasks.size()) {
</span><span class="cx"> auto familyLocallyInstalledFaces = std::make_unique<Vector<RefPtr<CSSFontFace>>>();
</span><span class="cx">
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> if (!face) {
</span><span class="cx"> if (!resolveGenericFamilyFirst)
</span><span class="cx"> familyForLookup = resolveGenericFamily(m_document, fontDescription, familyName);
</span><del>- return FontRanges(fontCache().fontForFamily(fontDescription, familyForLookup));
</del><ins>+ return FontRanges(FontCache::singleton().fontForFamily(fontDescription, familyForLookup));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return face->fontRanges(fontDescription);
</span><span class="lines">@@ -617,13 +617,13 @@
</span><span class="cx"> ASSERT_UNUSED(index, !index);
</span><span class="cx">
</span><span class="cx"> if (!m_document)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> Settings* settings = m_document->settings();
</span><span class="cx"> if (!settings || !settings->fontFallbackPrefersPictographs())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- return fontCache().fontForFamily(fontDescription, settings->pictographFontFamily());
</del><ins>+ return FontCache::singleton().fontForFamily(fontDescription, settings->pictographFontFamily());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> {
</span><span class="cx"> {
</span><span class="cx"> ReliefLogger log("Purge inactive FontData");
</span><del>- fontCache().purgeInactiveFontData();
</del><ins>+ FontCache::singleton().purgeInactiveFontData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> codeUnitsLength = 2;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- fallbackFont = fontCache().systemFallbackForCharacters(description, this, isForPlatformFont, codeUnits, codeUnitsLength).get();
</del><ins>+ fallbackFont = FontCache::singleton().systemFallbackForCharacters(description, this, isForPlatformFont, codeUnits, codeUnitsLength).get();
</ins><span class="cx"> if (fallbackFont)
</span><span class="cx"> fallbackFont->m_isUsedInSystemFallbackCache = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-FontCache& fontCache()
</del><ins>+FontCache& FontCache::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<FontCache> globalFontCache;
</span><span class="cx"> return globalFontCache;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(FontCache); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- friend FontCache& fontCache();
</del><ins>+ WEBCORE_EXPORT static FontCache& singleton();
</ins><span class="cx">
</span><span class="cx"> // This method is implemented by the platform.
</span><span class="cx"> RefPtr<Font> systemFallbackForCharacters(const FontDescription&, const Font* originalFontData, bool isPlatformFont, const UChar* characters, int length);
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> FontCache();
</span><del>- ~FontCache();
</del><ins>+ ~FontCache() = delete;
</ins><span class="cx">
</span><span class="cx"> void purgeTimerFired();
</span><span class="cx">
</span><span class="lines">@@ -177,9 +177,6 @@
</span><span class="cx"> friend class Font;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-// Get the global fontCache.
-WEBCORE_EXPORT FontCache& fontCache();
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -37,21 +37,20 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> FontGlyphs::FontGlyphs(PassRefPtr<FontSelector> fontSelector)
</span><del>- : m_cachedPrimaryFont(0)
</del><ins>+ : m_cachedPrimaryFont(nullptr)
</ins><span class="cx"> , m_fontSelector(fontSelector)
</span><span class="cx"> , m_fontSelectorVersion(m_fontSelector ? m_fontSelector->version() : 0)
</span><del>- , m_generation(fontCache().generation())
</del><ins>+ , m_generation(FontCache::singleton().generation())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontGlyphs::FontGlyphs(const FontPlatformData& platformData)
</span><del>- : m_cachedPrimaryFont(0)
- , m_fontSelector(0)
</del><ins>+ : m_cachedPrimaryFont(nullptr)
</ins><span class="cx"> , m_fontSelectorVersion(0)
</span><del>- , m_generation(fontCache().generation())
</del><ins>+ , m_generation(FontCache::singleton().generation())
</ins><span class="cx"> , m_isForPlatformFont(true)
</span><span class="cx"> {
</span><del>- m_realizedFallbackRanges.append(FontRanges(fontCache().fontForPlatformData(platformData)));
</del><ins>+ m_realizedFallbackRanges.append(FontRanges(FontCache::singleton().fontForPlatformData(platformData)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontGlyphs::~FontGlyphs()
</span><span class="lines">@@ -81,6 +80,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(index < description.familyCount());
</span><span class="cx">
</span><ins>+ auto& fontCache = FontCache::singleton();
</ins><span class="cx"> while (index < description.familyCount()) {
</span><span class="cx"> const AtomicString& family = description.familyAt(index++);
</span><span class="cx"> if (family.isEmpty())
</span><span class="lines">@@ -90,13 +90,13 @@
</span><span class="cx"> if (!ranges.isNull())
</span><span class="cx"> return ranges;
</span><span class="cx"> }
</span><del>- if (auto font = fontCache().fontForFamily(description, family))
</del><ins>+ if (auto font = fontCache.fontForFamily(description, family))
</ins><span class="cx"> return FontRanges(WTF::move(font));
</span><span class="cx"> }
</span><span class="cx"> // We didn't find a font. Try to find a similar font using our own specific knowledge about our platform.
</span><span class="cx"> // For example on OS X, we know to map any families containing the words Arabic, Pashto, or Urdu to the
</span><span class="cx"> // Geeza Pro font.
</span><del>- return FontRanges(fontCache().similarFont(description));
</del><ins>+ return FontRanges(fontCache.similarFont(description));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const FontRanges& FontGlyphs::realizeFallbackRangesAt(const FontDescription& description, unsigned index)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> return m_realizedFallbackRanges[index];
</span><span class="cx">
</span><span class="cx"> ASSERT(index == m_realizedFallbackRanges.size());
</span><del>- ASSERT(fontCache().generation() == m_generation);
</del><ins>+ ASSERT(FontCache::singleton().generation() == m_generation);
</ins><span class="cx">
</span><span class="cx"> m_realizedFallbackRanges.append(FontRanges());
</span><span class="cx"> auto& fontRanges = m_realizedFallbackRanges.last();
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> if (fontRanges.isNull() && m_fontSelector)
</span><span class="cx"> fontRanges = m_fontSelector->fontRangesForFamily(description, standardFamily);
</span><span class="cx"> if (fontRanges.isNull())
</span><del>- fontRanges = FontRanges(fontCache().lastResortFallbackFont(description));
</del><ins>+ fontRanges = FontRanges(FontCache::singleton().lastResortFallbackFont(description));
</ins><span class="cx"> return fontRanges;
</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 (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -339,11 +339,11 @@
</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().fontForPlatformData(scaledFontData);
</del><ins>+ return FontCache::singleton().fontForPlatformData(scaledFontData);
</ins><span class="cx"> }
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> #else
</span><span class="cx"> CTFontSymbolicTraits fontTraits = CTFontGetSymbolicTraits(m_platformData.font());
</span><span class="cx"> RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontCopyFontDescriptor(m_platformData.font()));
</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().fontForPlatformData(scaledFontData);
</del><ins>+ return FontCache::singleton().fontForPlatformData(scaledFontData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -346,29 +346,29 @@
</span><span class="cx"> PassRefPtr<OpenTypeVerticalData> FontPlatformData::verticalData() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hash());
</span><del>- return fontCache().getVerticalData(String::number(hash()), *this);
</del><ins>+ return FontCache::singleton().getVerticalData(String::number(hash()), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
</span><span class="cx"> {
</span><span class="cx"> FT_Face freeTypeFace = cairo_ft_scaled_font_lock_face(m_scaledFont);
</span><span class="cx"> if (!freeTypeFace)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> FT_ULong tableSize = 0;
</span><span class="cx"> // Tag bytes need to be reversed because OT_MAKE_TAG uses big-endian order.
</span><span class="cx"> uint32_t tag = FT_MAKE_TAG((table & 0xff), (table & 0xff00) >> 8, (table & 0xff0000) >> 16, table >> 24);
</span><span class="cx"> if (FT_Load_Sfnt_Table(freeTypeFace, tag, 0, 0, &tableSize))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> RefPtr<SharedBuffer> buffer = SharedBuffer::create(tableSize);
</span><span class="cx"> FT_ULong expectedTableSize = tableSize;
</span><span class="cx"> if (buffer->size() != tableSize)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> FT_Error error = FT_Load_Sfnt_Table(freeTypeFace, tag, 0, reinterpret_cast<FT_Byte*>(const_cast<char*>(buffer->data())), &tableSize);
</span><span class="cx"> if (error || tableSize != expectedTableSize)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> cairo_ft_scaled_font_unlock_face(m_scaledFont);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -275,13 +275,14 @@
</span><span class="cx"> m_complexTextRuns.append(ComplexTextRun::create(m_font.primaryFont(), cp, stringLocation + runRange.location, runRange.length, m_run.ltr()));
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- runFont = fontCache().fontForFamily(m_font.fontDescription(), fontName.get(), false).get();
</del><ins>+ auto& fontCache = FontCache::singleton();
+ runFont = fontCache.fontForFamily(m_font.fontDescription(), fontName.get(), false).get();
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> // Core Text may have used a font that is not known to NSFontManager. In that case, fall back on
</span><span class="cx"> // using the font as returned, even though it may not have the best NSFontRenderingMode.
</span><span class="cx"> if (!runFont) {
</span><span class="cx"> FontPlatformData runFontPlatformData((NSFont *)runCTFont, CTFontGetSize(runCTFont));
</span><del>- runFont = &fontCache().fontForPlatformData(runFontPlatformData).get();
</del><ins>+ runFont = fontCache.fontForPlatformData(runFontPlatformData).ptr();
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> // FIXME: Just assert for now, until we can devise a better fix that works with iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -275,16 +275,16 @@
</span><span class="cx"> static void invalidateFontCache(void*)
</span><span class="cx"> {
</span><span class="cx"> if (!isMainThread()) {
</span><del>- callOnMainThread(&invalidateFontCache, 0);
</del><ins>+ callOnMainThread(&invalidateFontCache, nullptr);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- fontCache().invalidate();
</del><ins>+ FontCache::singleton().invalidate();
</ins><span class="cx"> [desiredFamilyToAvailableFamilyDictionary() removeAllObjects];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void fontCacheRegisteredFontsChangedNotificationCallback(CFNotificationCenterRef, void* observer, CFStringRef name, const void *, CFDictionaryRef)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(observer, observer == &fontCache());
</del><ins>+ ASSERT_UNUSED(observer, observer == &FontCache::singleton());
</ins><span class="cx"> ASSERT_UNUSED(name, CFEqual(name, kCTFontManagerRegisteredFontsChangedNotification));
</span><span class="cx"> invalidateFontCache(0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCacheWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> static bool initialized;
</span><span class="cx"> if (!initialized) {
</span><span class="cx"> initialized = true;
</span><del>- IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface();
</del><ins>+ IMLangFontLinkType* langFontLink = FontCache::singleton().getFontLinkInterface();
</ins><span class="cx"> if (!langFontLink)
</span><span class="cx"> return codePageMasks;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -884,7 +884,7 @@
</span><span class="cx">
</span><span class="cx"> void Internals::invalidateFontCache()
</span><span class="cx"> {
</span><del>- fontCache().invalidate();
</del><ins>+ FontCache::singleton().invalidate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::setScrollViewPosition(long x, long y, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> symbolWithPointer(?create@BitmapInfo@WebCore@@SA?AU12@ABVIntSize@2@W4BitCount@12@@Z, ?create@BitmapInfo@WebCore@@SA?AU12@AEBVIntSize@2@W4BitCount@12@@Z)
</span><span class="cx"> symbolWithPointer(?drawPattern@Image@WebCore@@UAEXPAVGraphicsContext@2@ABVFloatRect@2@ABVAffineTransform@2@ABVFloatPoint@2@W4ColorSpace@2@W4CompositeOperator@2@1W4BlendMode@2@@Z, ?drawPattern@Image@WebCore@@UEAAXPEAVGraphicsContext@2@AEBVFloatRect@2@AEBVAffineTransform@2@AEBVFloatPoint@2@W4ColorSpace@2@W4CompositeOperator@2@1W4BlendMode@2@@Z)
</span><span class="cx"> symbolWithPointer(?drawFrameMatchingSourceSize@BitmapImage@WebCore@@MAEXPAVGraphicsContext@2@ABVFloatRect@2@ABVIntSize@2@W4ColorSpace@2@W4CompositeOperator@2@@Z, ?drawFrameMatchingSourceSize@BitmapImage@WebCore@@MEAAXPEAVGraphicsContext@2@AEBVFloatRect@2@AEBVIntSize@2@W4ColorSpace@2@W4CompositeOperator@2@@Z)
</span><del>- symbolWithPointer(?fontCache@WebCore@@YAAAVFontCache@1@XZ, ?fontCache@WebCore@@YAAEAVFontCache@1@XZ)
</del><ins>+ symbolWithPointer(?singleton@FontCache@WebCore@@SAAAV12@XZ, ?singleton@FontCache@WebCore@@SAAAV12@XZ)
</ins><span class="cx"> symbolWithPointer(?invalidate@FontCache@WebCore@@QAEXXZ, ?invalidate@FontCache@WebCore@@QEAAXXZ)
</span><span class="cx"> symbolWithPointer(?mayFillWithSolidColor@BitmapImage@WebCore@@MAE_NXZ, ?mayFillWithSolidColor@BitmapImage@WebCore@@MEAA_NXZ)
</span><span class="cx"> symbolWithPointer(?solidColor@BitmapImage@WebCore@@MBE?AVColor@2@XZ, ?solidColor@BitmapImage@WebCore@@MEBA?AVColor@2@XZ)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-18 Chris Dumez <cdumez@apple.com>
+
+ Access FontCache global instance via singleton() static member function
+ https://bugs.webkit.org/show_bug.cgi?id=141726
+
+ Reviewed by Daniel Bates.
+
+ Access FontCache global instance via singleton() static member function,
+ as per coding style.
+
</ins><span class="cx"> 2015-02-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Access MemoryPressureHandler global instance via a singleton() static member function
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCoreStatisticsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -147,17 +147,17 @@
</span><span class="cx">
</span><span class="cx"> + (size_t)cachedFontDataCount
</span><span class="cx"> {
</span><del>- return fontCache().fontCount();
</del><ins>+ return FontCache::singleton().fontCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (size_t)cachedFontDataInactiveCount
</span><span class="cx"> {
</span><del>- return fontCache().inactiveFontCount();
</del><ins>+ return FontCache::singleton().inactiveFontCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)purgeInactiveFontData
</span><span class="cx"> {
</span><del>- fontCache().purgeInactiveFontData();
</del><ins>+ FontCache::singleton().purgeInactiveFontData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (size_t)glyphPageCount
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -4875,7 +4875,7 @@
</span><span class="cx"> fontDescription.setIsItalic(italic);
</span><span class="cx"> fontDescription.setWeight(bold ? FontWeight900 : FontWeight500);
</span><span class="cx"> fontDescription.setSpecifiedSize(pointSize);
</span><del>- RefPtr<Font> font = fontCache().fontForFamily(fontDescription, familyName);
</del><ins>+ RefPtr<Font> font = FontCache::singleton().fontForFamily(fontDescription, familyName);
</ins><span class="cx"> return [font->platformData().nsFont() fontName];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -1346,7 +1346,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WebThreadIsCurrent());
</span><span class="cx"> WebKit::MemoryMeasure measurer("Memory warning: Purging inactive font data.");
</span><del>- fontCache().purgeInactiveFontData();
</del><ins>+ FontCache::singleton().purgeInactiveFontData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)drainLayerPool
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebKit/win/ChangeLog 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-18 Chris Dumez <cdumez@apple.com>
+
+ Access FontCache global instance via singleton() static member function
+ https://bugs.webkit.org/show_bug.cgi?id=141726
+
+ Reviewed by Daniel Bates.
+
+ Access FontCache global instance via singleton() static member function,
+ as per coding style.
+
</ins><span class="cx"> 2015-02-09 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: remove some unnecessary Inspector prefixes from class names in Inspector namespace
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreStatistics.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreStatistics.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebKit/win/WebCoreStatistics.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!count)
</span><span class="cx"> return E_POINTER;
</span><del>- *count = (UINT) fontCache().fontCount();
</del><ins>+ *count = (UINT) FontCache::singleton().fontCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -224,13 +224,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (!count)
</span><span class="cx"> return E_POINTER;
</span><del>- *count = (UINT) fontCache().inactiveFontCount();
</del><ins>+ *count = (UINT) FontCache::singleton().inactiveFontCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebCoreStatistics::purgeInactiveFontData(void)
</span><span class="cx"> {
</span><del>- fontCache().purgeInactiveFontData();
</del><ins>+ FontCache::singleton().purgeInactiveFontData();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-18 Chris Dumez <cdumez@apple.com>
+
+ Access FontCache global instance via singleton() static member function
+ https://bugs.webkit.org/show_bug.cgi?id=141726
+
+ Reviewed by Daniel Bates.
+
+ Access FontCache global instance via singleton() static member function,
+ as per coding style.
+
</ins><span class="cx"> 2015-02-18 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WKContext SPI to clear all visited links
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (180280 => 180281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-18 19:57:35 UTC (rev 180280)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-18 20:05:11 UTC (rev 180281)
</span><span class="lines">@@ -587,7 +587,7 @@
</span><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> gcController().garbageCollectNow();
</span><del>- fontCache().invalidate();
</del><ins>+ FontCache::singleton().invalidate();
</ins><span class="cx"> MemoryCache::singleton().setDisabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -640,12 +640,12 @@
</span><span class="cx"> // Close all the live pages.
</span><span class="cx"> Vector<RefPtr<WebPage>> pages;
</span><span class="cx"> copyValuesToVector(m_pageMap, pages);
</span><del>- for (size_t i = 0; i < pages.size(); ++i)
- pages[i]->close();
</del><ins>+ for (auto& page : pages)
+ page->close();
</ins><span class="cx"> pages.clear();
</span><span class="cx">
</span><span class="cx"> gcController().garbageCollectSoon();
</span><del>- fontCache().invalidate();
</del><ins>+ FontCache::singleton().invalidate();
</ins><span class="cx"> MemoryCache::singleton().setDisabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -940,8 +940,9 @@
</span><span class="cx"> data.statisticsNumbers.set(ASCIILiteral("IconsWithDataCount"), iconDatabase().iconRecordCountWithData());
</span><span class="cx">
</span><span class="cx"> // Gather font statistics.
</span><del>- data.statisticsNumbers.set(ASCIILiteral("CachedFontDataCount"), fontCache().fontCount());
- data.statisticsNumbers.set(ASCIILiteral("CachedFontDataInactiveCount"), fontCache().inactiveFontCount());
</del><ins>+ auto& fontCache = FontCache::singleton();
+ data.statisticsNumbers.set(ASCIILiteral("CachedFontDataCount"), fontCache.fontCount());
+ data.statisticsNumbers.set(ASCIILiteral("CachedFontDataInactiveCount"), fontCache.inactiveFontCount());
</ins><span class="cx">
</span><span class="cx"> // Gather glyph page statistics.
</span><span class="cx"> data.statisticsNumbers.set(ASCIILiteral("GlyphPageCount"), GlyphPage::count());
</span></span></pre>
</div>
</div>
</body>
</html>