<!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>[167768] 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/167768">167768</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-04-24 12:05:47 -0700 (Thu, 24 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FontCache::fontCache() never returns nullptr so it can be made to return a reference instead
https://bugs.webkit.org/show_bug.cgi?id=132110
Reviewed by Tim Horton.
Updates callers to use '.' instead of '->'.
No new tests are necessary because there should be no behavior change.
Source/WebCore:
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::getFontData):
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::CSSFontSelector):
(WebCore::CSSFontSelector::~CSSFontSelector):
(WebCore::CSSFontSelector::addFontFaceRule):
(WebCore::fontDataForGenericFamily):
(WebCore::CSSFontSelector::getFallbackFontData):
* platform/MemoryPressureHandler.cpp:
(WebCore::MemoryPressureHandler::releaseMemory):
* platform/graphics/FontCache.cpp:
(WebCore::fontCache): Return a reference
* platform/graphics/FontCache.h:
(WebCore::FontCachePurgePreventer::FontCachePurgePreventer):
(WebCore::FontCachePurgePreventer::~FontCachePurgePreventer):
* platform/graphics/FontGlyphs.cpp:
(WebCore::FontGlyphs::FontGlyphs):
(WebCore::FontGlyphs::releaseFontData):
(WebCore::FontGlyphs::realizeFontDataAt):
(WebCore::FontGlyphs::glyphDataAndPageForCharacter):
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
(WebCore::FontPlatformData::verticalData):
* platform/graphics/ios/SimpleFontDataIOS.mm:
(WebCore::SimpleFontData::platformCreateScaledFontData):
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
(WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::invalidateFontCache):
(WebCore::fontCacheRegisteredFontsChangedNotificationCallback):
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::SimpleFontData::platformDestroy):
(WebCore::SimpleFontData::platformCreateScaledFontData):
* platform/graphics/win/FontCacheWin.cpp:
(WebCore::getCJKCodePageMasks):
* platform/graphics/win/SimpleFontDataWin.cpp:
(WebCore::SimpleFontData::containsCharacters):
* platform/graphics/wince/FontCacheWinCE.cpp:
(WebCore::getCJKCodePageMasks):
* platform/graphics/wince/FontPlatformData.cpp:
(WebCore::FontFamilyCodePageInfo::codePages):
(WebCore::FixedSizeFontData::create):
* platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp:
(WebCore::GlyphPage::fill):
* platform/graphics/wince/SimpleFontDataWinCE.cpp:
(WebCore::SimpleFontData::platformCreateScaledFontData):
(WebCore::SimpleFontData::containsCharacters):
Source/WebKit/efl:
* ewk/ewk_settings.cpp:
(ewk_settings_memory_cache_clear):
Source/WebKit/ios:
* Misc/EmojiFallbackFontSelector.cpp:
(EmojiFallbackFontSelector::getFallbackFontData):
Source/WebKit/mac:
* Misc/WebCoreStatistics.mm:
(+[WebCoreStatistics cachedFontDataCount]):
(+[WebCoreStatistics cachedFontDataInactiveCount]):
(+[WebCoreStatistics purgeInactiveFontData]):
* WebView/WebView.mm:
(+[WebView purgeInactiveFontData]):
Source/WebKit/win:
* WebCoreStatistics.cpp:
(WebCoreStatistics::cachedFontDataCount):
(WebCoreStatistics::cachedFontDataInactiveCount):
(WebCoreStatistics::purgeInactiveFontData):
Source/WebKit2:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::terminate):
(WebKit::WebProcess::didClose):
(WebKit::WebProcess::getWebCoreStatistics):</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="#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="#trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosSimpleFontDataIOSmm">trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm</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="#trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm">trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCacheWincpp">trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp">trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceFontCacheWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceFontPlatformDatacpp">trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceGlyphPageTreeNodeWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceSimpleFontDataWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_settingscpp">trunk/Source/WebKit/efl/ewk/ewk_settings.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscEmojiFallbackFontSelectorcpp">trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.cpp</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="#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 (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2014-04-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ FontCache::fontCache() never returns nullptr so it can be made to return a reference instead
+ https://bugs.webkit.org/show_bug.cgi?id=132110
+
+ Reviewed by Tim Horton.
+
+ Updates callers to use '.' instead of '->'.
+
+ No new tests are necessary because there should be no behavior change.
+
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::getFontData):
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::CSSFontSelector):
+ (WebCore::CSSFontSelector::~CSSFontSelector):
+ (WebCore::CSSFontSelector::addFontFaceRule):
+ (WebCore::fontDataForGenericFamily):
+ (WebCore::CSSFontSelector::getFallbackFontData):
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::releaseMemory):
+ * platform/graphics/FontCache.cpp:
+ (WebCore::fontCache): Return a reference
+ * platform/graphics/FontCache.h:
+ (WebCore::FontCachePurgePreventer::FontCachePurgePreventer):
+ (WebCore::FontCachePurgePreventer::~FontCachePurgePreventer):
+ * platform/graphics/FontGlyphs.cpp:
+ (WebCore::FontGlyphs::FontGlyphs):
+ (WebCore::FontGlyphs::releaseFontData):
+ (WebCore::FontGlyphs::realizeFontDataAt):
+ (WebCore::FontGlyphs::glyphDataAndPageForCharacter):
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+ (WebCore::FontPlatformData::verticalData):
+ * platform/graphics/ios/SimpleFontDataIOS.mm:
+ (WebCore::SimpleFontData::platformCreateScaledFontData):
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::invalidateFontCache):
+ (WebCore::fontCacheRegisteredFontsChangedNotificationCallback):
+ * platform/graphics/mac/SimpleFontDataMac.mm:
+ (WebCore::SimpleFontData::platformDestroy):
+ (WebCore::SimpleFontData::platformCreateScaledFontData):
+ * platform/graphics/win/FontCacheWin.cpp:
+ (WebCore::getCJKCodePageMasks):
+ * platform/graphics/win/SimpleFontDataWin.cpp:
+ (WebCore::SimpleFontData::containsCharacters):
+ * platform/graphics/wince/FontCacheWinCE.cpp:
+ (WebCore::getCJKCodePageMasks):
+ * platform/graphics/wince/FontPlatformData.cpp:
+ (WebCore::FontFamilyCodePageInfo::codePages):
+ (WebCore::FixedSizeFontData::create):
+ * platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp:
+ (WebCore::GlyphPage::fill):
+ * platform/graphics/wince/SimpleFontDataWinCE.cpp:
+ (WebCore::SimpleFontData::platformCreateScaledFontData):
+ (WebCore::SimpleFontData::containsCharacters):
+
</ins><span class="cx"> 2014-04-24 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Manage AudioSession category according to media type
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> ) {
</span><span class="cx"> // We're local. Just return a SimpleFontData 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()->getCachedFontData(fontDescription, m_string, true);
</del><ins>+ return fontCache().getCachedFontData(fontDescription, m_string, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // See if we have a mapping in our FontData cache.
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx">
</span><span class="cx"> // This temporary font is not retained and should not be returned.
</span><span class="cx"> FontCachePurgePreventer fontCachePurgePreventer;
</span><del>- SimpleFontData* temporaryFont = fontCache()->getNonRetainedLastResortFallbackFont(fontDescription);
</del><ins>+ SimpleFontData* temporaryFont = fontCache().getNonRetainedLastResortFallbackFont(fontDescription);
</ins><span class="cx"> fontData = SimpleFontData::create(temporaryFont->platformData(), true, true);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</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().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().removeClient(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSFontSelector::isEmpty() const
</span><span class="lines">@@ -300,7 +300,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().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">@@ -386,7 +386,7 @@
</span><span class="cx"> genericFamily = settings.standardFontFamily(script);
</span><span class="cx">
</span><span class="cx"> if (!genericFamily.isEmpty())
</span><del>- return fontCache()->getCachedFontData(fontDescription, genericFamily);
</del><ins>+ return fontCache().getCachedFontData(fontDescription, genericFamily);
</ins><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -649,7 +649,7 @@
</span><span class="cx"> if (!settings || !settings->fontFallbackPrefersPictographs())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return fontCache()->getCachedFontData(fontDescription, settings->pictographFontFamily());
</del><ins>+ return fontCache().getCachedFontData(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 (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</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().purgeInactiveFontData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -85,11 +85,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: We should return a reference instead of a pointer since we never return a nullptr.
-FontCache* fontCache()
</del><ins>+FontCache& fontCache()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<FontCache> globalFontCache;
</span><del>- return &globalFontCache.get();
</del><ins>+ return globalFontCache.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontCache::FontCache()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -108,7 +108,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>+ friend FontCache& fontCache();
</ins><span class="cx">
</span><span class="cx"> enum ShouldRetain { Retain, DoNotRetain };
</span><span class="cx">
</span><span class="lines">@@ -203,12 +203,12 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Get the global fontCache.
</span><del>-FontCache* fontCache();
</del><ins>+FontCache& fontCache();
</ins><span class="cx">
</span><span class="cx"> class FontCachePurgePreventer {
</span><span class="cx"> public:
</span><del>- FontCachePurgePreventer() { fontCache()->disablePurging(); }
- ~FontCachePurgePreventer() { fontCache()->enablePurging(); }
</del><ins>+ FontCachePurgePreventer() { fontCache().disablePurging(); }
+ ~FontCachePurgePreventer() { fontCache().enablePurging(); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> , m_fontSelector(fontSelector)
</span><span class="cx"> , m_fontSelectorVersion(m_fontSelector ? m_fontSelector->version() : 0)
</span><span class="cx"> , m_familyIndex(0)
</span><del>- , m_generation(fontCache()->generation())
</del><ins>+ , m_generation(fontCache().generation())
</ins><span class="cx"> , m_pitch(UnknownPitch)
</span><span class="cx"> , m_loadingCustomFonts(false)
</span><span class="cx"> , m_isForPlatformFont(false)
</span><span class="lines">@@ -55,12 +55,12 @@
</span><span class="cx"> , m_fontSelector(0)
</span><span class="cx"> , m_fontSelectorVersion(0)
</span><span class="cx"> , m_familyIndex(cAllFamiliesScanned)
</span><del>- , m_generation(fontCache()->generation())
</del><ins>+ , m_generation(fontCache().generation())
</ins><span class="cx"> , m_pitch(UnknownPitch)
</span><span class="cx"> , m_loadingCustomFonts(false)
</span><span class="cx"> , m_isForPlatformFont(true)
</span><span class="cx"> {
</span><del>- RefPtr<FontData> fontData = fontCache()->getCachedFontData(&platformData);
</del><ins>+ RefPtr<FontData> fontData = fontCache().getCachedFontData(&platformData);
</ins><span class="cx"> m_realizedFontData.append(fontData.release());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> if (m_realizedFontData[i]->isCustomFont())
</span><span class="cx"> continue;
</span><span class="cx"> ASSERT(!m_realizedFontData[i]->isSegmented());
</span><del>- fontCache()->releaseFontData(static_cast<const SimpleFontData*>(m_realizedFontData[i].get()));
</del><ins>+ fontCache().releaseFontData(static_cast<const SimpleFontData*>(m_realizedFontData[i].get()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -117,8 +117,8 @@
</span><span class="cx"> // We are obtaining this font for the first time. We keep track of the families we've looked at before
</span><span class="cx"> // in |m_familyIndex|, so that we never scan the same spot in the list twice. getFontData will adjust our
</span><span class="cx"> // |m_familyIndex| as it scans for the right font to make.
</span><del>- ASSERT(fontCache()->generation() == m_generation);
- RefPtr<FontData> result = fontCache()->getFontData(description, m_familyIndex, m_fontSelector.get());
</del><ins>+ ASSERT(fontCache().generation() == m_generation);
+ RefPtr<FontData> result = fontCache().getFontData(description, m_familyIndex, m_fontSelector.get());
</ins><span class="cx"> if (result) {
</span><span class="cx"> m_realizedFontData.append(result);
</span><span class="cx"> if (result->isLoading())
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> codeUnitsLength = 2;
</span><span class="cx"> }
</span><span class="cx"> const SimpleFontData* originalFontData = primaryFontData(description)->fontDataForCharacter(c);
</span><del>- RefPtr<SimpleFontData> characterFontData = fontCache()->systemFallbackForCharacters(description, originalFontData, m_isForPlatformFont, codeUnits, codeUnitsLength);
</del><ins>+ RefPtr<SimpleFontData> characterFontData = fontCache().systemFallbackForCharacters(description, originalFontData, m_isForPlatformFont, codeUnits, codeUnitsLength);
</ins><span class="cx"> if (characterFontData) {
</span><span class="cx"> if (characterFontData->platformData().orientation() == Vertical && !characterFontData->hasVerticalGlyphs() && Font::isCJKIdeographOrSymbol(c))
</span><span class="cx"> variant = BrokenIdeographVariant;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -343,7 +343,7 @@
</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().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></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosSimpleFontDataIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -159,7 +159,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()->getCachedFontData(&scaledFontData);
</del><ins>+ return fontCache().getCachedFontData(&scaledFontData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -269,13 +269,13 @@
</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>- runFontData = fontCache()->getCachedFontData(m_font.fontDescription(), fontName.get(), false, FontCache::DoNotRetain).get();
</del><ins>+ runFontData = fontCache().getCachedFontData(m_font.fontDescription(), fontName.get(), false, FontCache::DoNotRetain).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 (!runFontData) {
</span><span class="cx"> FontPlatformData runFontPlatformData((NSFont *)runFont, CTFontGetSize(runFont), m_font.fontDescription().usePrinterFont());
</span><del>- runFontData = fontCache()->getCachedFontData(&runFontPlatformData, FontCache::DoNotRetain).get();
</del><ins>+ runFontData = fontCache().getCachedFontData(&runFontPlatformData, FontCache::DoNotRetain).get();
</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 (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -51,12 +51,12 @@
</span><span class="cx"> callOnMainThread(&invalidateFontCache, 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- fontCache()->invalidate();
</del><ins>+ fontCache().invalidate();
</ins><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());
</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="trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -275,10 +275,10 @@
</span><span class="cx"> if (!isCustomFont() && m_derivedFontData) {
</span><span class="cx"> // These come from the cache.
</span><span class="cx"> if (m_derivedFontData->smallCaps)
</span><del>- fontCache()->releaseFontData(m_derivedFontData->smallCaps.get());
</del><ins>+ fontCache().releaseFontData(m_derivedFontData->smallCaps.get());
</ins><span class="cx">
</span><span class="cx"> if (m_derivedFontData->emphasisMark)
</span><del>- fontCache()->releaseFontData(m_derivedFontData->emphasisMark.get());
</del><ins>+ fontCache().releaseFontData(m_derivedFontData->emphasisMark.get());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> scaledFontData.m_syntheticOblique = (fontTraits & NSItalicFontMask) && !(scaledFontTraits & NSItalicFontMask);
</span><span class="cx">
</span><span class="cx"> // SimpleFontData::platformDestroy() takes care of not deleting the cached font data twice.
</span><del>- return fontCache()->getCachedFontData(&scaledFontData);
</del><ins>+ return fontCache().getCachedFontData(&scaledFontData);
</ins><span class="cx"> }
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</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 (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -138,7 +138,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().getFontLinkInterface();
</ins><span class="cx"> if (!langFontLink)
</span><span class="cx"> return codePageMasks;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> // FIXME: Microsoft documentation seems to imply that characters can be output using a given font and DC
</span><span class="cx"> // merely by testing code page intersection. This seems suspect though. Can't a font only partially
</span><span class="cx"> // cover a given code page?
</span><del>- IMLangFontLinkType* langFontLink = fontCache()->getFontLinkInterface();
</del><ins>+ IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface();
</ins><span class="cx"> if (!langFontLink)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceFontCacheWinCEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/wince/FontCacheWinCE.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -127,7 +127,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().getFontLinkInterface();
</ins><span class="cx"> if (!langFontLink)
</span><span class="cx"> return codePageMasks;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceFontPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> DWORD codePages() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_codePages) {
</span><del>- if (IMLangFontLinkType* langFontLink = fontCache()->getFontLinkInterface())
</del><ins>+ if (IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface())
</ins><span class="cx"> langFontLink->CodePageToCodePages(m_codePage, &m_codePages);
</span><span class="cx"> }
</span><span class="cx"> return m_codePages;
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx">
</span><span class="cx"> GetTextMetrics(g_screenDC, &fontData->m_metrics);
</span><span class="cx">
</span><del>- if (IMLangFontLinkType* langFontLink = fontCache()->getFontLinkInterface()) {
</del><ins>+ if (IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface()) {
</ins><span class="cx"> langFontLink->GetFontCodePages(g_screenDC, fontData->m_hfont.get(), &fontData->m_codePages);
</span><span class="cx"> fontData->m_codePages |= FontPlatformData::getKnownFontCodePages(winFont.lfFaceName);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceGlyphPageTreeNodeWinCEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> setGlyphDataForIndex(offset + i, 0, 0);
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><del>- } else if (IMLangFontLinkType* langFontLink = fontCache()->getFontLinkInterface()) {
</del><ins>+ } else if (IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface()) {
</ins><span class="cx"> for (unsigned i = 0; i < bufferLength; ++i) {
</span><span class="cx"> DWORD actualCodePages;
</span><span class="cx"> langFontLink->GetCharCodePages(buffer[i], &actualCodePages);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceSimpleFontDataWinCEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> fontDesc.setComputedSize(lroundf(scaleFactor * fontDesc.computedSize()));
</span><span class="cx"> fontDesc.setSpecifiedSize(lroundf(scaleFactor * fontDesc.specifiedSize()));
</span><span class="cx"> fontDesc.setKeywordSize(lroundf(scaleFactor * fontDesc.keywordSize()));
</span><del>- FontPlatformData* result = fontCache()->getCachedFontPlatformData(fontDesc, m_platformData.family());
</del><ins>+ FontPlatformData* result = fontCache().getCachedFontPlatformData(fontDesc, m_platformData.family());
</ins><span class="cx"> if (!result)
</span><span class="cx"> return 0;
</span><span class="cx"> return SimpleFontData::create(*result);
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> // cover a given code page?
</span><span class="cx">
</span><span class="cx"> // FIXME: in the case that we failed to get the interface, still use the font.
</span><del>- IMLangFontLinkType* langFontLink = fontCache()->getFontLinkInterface();
</del><ins>+ IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface();
</ins><span class="cx"> if (!langFontLink)
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ FontCache::fontCache() never returns nullptr so it can be made to return a reference instead
+ https://bugs.webkit.org/show_bug.cgi?id=132110
+
+ Reviewed by Tim Horton.
+
+ Updates callers to use '.' instead of '->'.
+
+ No new tests are necessary because there should be no behavior change.
+
+ * ewk/ewk_settings.cpp:
+ (ewk_settings_memory_cache_clear):
+
</ins><span class="cx"> 2014-04-23 Hyowon Kim <hw1008.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK1] Add *const* keyword to _get() APIs
</span></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_settingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ewk/ewk_settings.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_settings.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit/efl/ewk/ewk_settings.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> WebCore::pageCache()->setCapacity(pageCapacity);
</span><span class="cx">
</span><span class="cx"> // Invalidating the font cache and freeing all inactive font data.
</span><del>- WebCore::fontCache()->invalidate();
</del><ins>+ WebCore::fontCache().invalidate();
</ins><span class="cx">
</span><span class="cx"> // Empty the Cross-Origin Preflight cache
</span><span class="cx"> WebCore::CrossOriginPreflightResultCache::shared().empty();
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ FontCache::fontCache() never returns nullptr so it can be made to return a reference instead
+ https://bugs.webkit.org/show_bug.cgi?id=132110
+
+ Reviewed by Tim Horton.
+
+ Updates callers to use '.' instead of '->'.
+
+ No new tests are necessary because there should be no behavior change.
+
+ * Misc/EmojiFallbackFontSelector.cpp:
+ (EmojiFallbackFontSelector::getFallbackFontData):
+
</ins><span class="cx"> 2014-04-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Hook up screen.{availHeight, availWidth, height, width}
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscEmojiFallbackFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx"> PassRefPtr<FontData> EmojiFallbackFontSelector::getFallbackFontData(const FontDescription& fontDescription, size_t)
</span><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, appleColorEmoji, ("Apple Color Emoji"));
</span><del>- RefPtr<FontData> fontData = fontCache()->getCachedFontData(fontDescription, appleColorEmoji);
</del><ins>+ RefPtr<FontData> fontData = fontCache().getCachedFontData(fontDescription, appleColorEmoji);
</ins><span class="cx"> if (!fontData) {
</span><span class="cx"> LOG_ERROR("Failed to get \"Apple Color Emoji\" from the font cache. Using the last resort fallback font instead.");
</span><del>- fontData = fontCache()->getLastResortFallbackFont(fontDescription);
</del><ins>+ fontData = fontCache().getLastResortFallbackFont(fontDescription);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return fontData.release();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ FontCache::fontCache() never returns nullptr so it can be made to return a reference instead
+ https://bugs.webkit.org/show_bug.cgi?id=132110
+
+ Reviewed by Tim Horton.
+
+ Updates callers to use '.' instead of '->'.
+
+ No new tests are necessary because there should be no behavior change.
+
+ * Misc/WebCoreStatistics.mm:
+ (+[WebCoreStatistics cachedFontDataCount]):
+ (+[WebCoreStatistics cachedFontDataInactiveCount]):
+ (+[WebCoreStatistics purgeInactiveFontData]):
+ * WebView/WebView.mm:
+ (+[WebView purgeInactiveFontData]):
+
</ins><span class="cx"> 2014-04-24 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Manage AudioSession category according to media type
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCoreStatisticsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2014-04-24 19:05:47 UTC (rev 167768)
</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()->fontDataCount();
</del><ins>+ return fontCache().fontDataCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (size_t)cachedFontDataInactiveCount
</span><span class="cx"> {
</span><del>- return fontCache()->inactiveFontDataCount();
</del><ins>+ return fontCache().inactiveFontDataCount();
</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().purgeInactiveFontData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (size_t)glyphPageCount
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -1328,7 +1328,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().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 (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit/win/ChangeLog 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ FontCache::fontCache() never returns nullptr so it can be made to return a reference instead
+ https://bugs.webkit.org/show_bug.cgi?id=132110
+
+ Reviewed by Tim Horton.
+
+ Updates callers to use '.' instead of '->'.
+
+ No new tests are necessary because there should be no behavior change.
+
+ * WebCoreStatistics.cpp:
+ (WebCoreStatistics::cachedFontDataCount):
+ (WebCoreStatistics::cachedFontDataInactiveCount):
+ (WebCoreStatistics::purgeInactiveFontData):
+
</ins><span class="cx"> 2014-04-22 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Begin implementation of video using Media Foundation.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreStatistics.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreStatistics.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit/win/WebCoreStatistics.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!count)
</span><span class="cx"> return E_POINTER;
</span><del>- *count = (UINT) fontCache()->fontDataCount();
</del><ins>+ *count = (UINT) fontCache().fontDataCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -202,13 +202,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (!count)
</span><span class="cx"> return E_POINTER;
</span><del>- *count = (UINT) fontCache()->inactiveFontDataCount();
</del><ins>+ *count = (UINT) fontCache().inactiveFontDataCount();
</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().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 (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ FontCache::fontCache() never returns nullptr so it can be made to return a reference instead
+ https://bugs.webkit.org/show_bug.cgi?id=132110
+
+ Reviewed by Tim Horton.
+
+ Updates callers to use '.' instead of '->'.
+
+ No new tests are necessary because there should be no behavior change.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::terminate):
+ (WebKit::WebProcess::didClose):
+ (WebKit::WebProcess::getWebCoreStatistics):
+
</ins><span class="cx"> 2014-04-24 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Manage AudioSession category according to media type
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (167767 => 167768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-04-24 19:04:01 UTC (rev 167767)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-04-24 19:05:47 UTC (rev 167768)
</span><span class="lines">@@ -564,7 +564,7 @@
</span><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> gcController().garbageCollectNow();
</span><del>- fontCache()->invalidate();
</del><ins>+ fontCache().invalidate();
</ins><span class="cx"> memoryCache()->setDisabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -617,7 +617,7 @@
</span><span class="cx"> pages.clear();
</span><span class="cx">
</span><span class="cx"> gcController().garbageCollectSoon();
</span><del>- fontCache()->invalidate();
</del><ins>+ fontCache().invalidate();
</ins><span class="cx"> memoryCache()->setDisabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -898,8 +898,8 @@
</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()->fontDataCount());
- data.statisticsNumbers.set(ASCIILiteral("CachedFontDataInactiveCount"), fontCache()->inactiveFontDataCount());
</del><ins>+ data.statisticsNumbers.set(ASCIILiteral("CachedFontDataCount"), fontCache().fontDataCount());
+ data.statisticsNumbers.set(ASCIILiteral("CachedFontDataInactiveCount"), fontCache().inactiveFontDataCount());
</ins><span class="cx">
</span><span class="cx"> // Gather glyph page statistics.
</span><span class="cx"> data.statisticsNumbers.set(ASCIILiteral("GlyphPageCount"), GlyphPageTreeNode::treeGlyphPageCount());
</span></span></pre>
</div>
</div>
</body>
</html>