<!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>[174517] 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/174517">174517</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-10-09 12:16:05 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove second-to-last client of WebFontCache
https://bugs.webkit.org/show_bug.cgi?id=137550
Reviewed by Darin Adler.
Source/WebCore:
No new tests because no behavior change.
* WebCore.exp.in:
* platform/graphics/FontCache.h: Allow migration of client to getCachedFontData()
Source/WebKit/mac:
Use FontCache::getCachedFontData() instead of WebFontCache.
* WebView/WebHTMLView.mm:
(-[WebHTMLView _addToStyle:fontA:fontB:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174516 => 174517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-09 19:05:51 UTC (rev 174516)
+++ trunk/Source/WebCore/ChangeLog 2014-10-09 19:16:05 UTC (rev 174517)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove second-to-last client of WebFontCache
+ https://bugs.webkit.org/show_bug.cgi?id=137550
+
+ Reviewed by Darin Adler.
+
+ No new tests because no behavior change.
+
+ * WebCore.exp.in:
+ * platform/graphics/FontCache.h: Allow migration of client to getCachedFontData()
+
</ins><span class="cx"> 2014-10-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Spending too much time mapping desired font families to available ones
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (174516 => 174517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-10-09 19:05:51 UTC (rev 174516)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-10-09 19:16:05 UTC (rev 174517)
</span><span class="lines">@@ -1404,6 +1404,7 @@
</span><span class="cx"> __ZN7WebCore9FloatSizeC1ERKNS_7IntSizeE
</span><span class="cx"> __ZN7WebCore9FontCache10invalidateEv
</span><span class="cx"> __ZN7WebCore9FontCache13fontDataCountEv
</span><ins>+__ZN7WebCore9FontCache17getCachedFontDataERKNS_15FontDescriptionERKN3WTF12AtomicStringEbNS0_12ShouldRetainE
</ins><span class="cx"> __ZN7WebCore9FontCache21inactiveFontDataCountEv
</span><span class="cx"> __ZN7WebCore9FontCache21purgeInactiveFontDataEi
</span><span class="cx"> __ZN7WebCore9FontCache29purgeInactiveFontDataIfNeededEv
</span><span class="lines">@@ -2744,7 +2745,6 @@
</span><span class="cx"> __ZN7WebCore8Settings31setAudioSessionCategoryOverrideEj
</span><span class="cx"> __ZN7WebCore8Settings34setNetworkDataUsageTrackingEnabledEb
</span><span class="cx"> __ZN7WebCore8Settings38gShouldOptOutOfNetworkStateObservationE
</span><del>-__ZN7WebCore9FontCache17getCachedFontDataERKNS_15FontDescriptionERKN3WTF12AtomicStringEbNS0_12ShouldRetainE
</del><span class="cx"> __ZN7WebCore9FontCache25getLastResortFallbackFontERKNS_15FontDescriptionENS0_12ShouldRetainE
</span><span class="cx"> __ZN7WebCore9FrameView17setScrollVelocityEdddd
</span><span class="cx"> __ZN7WebCore9FrameView20setWasScrolledByUserEb
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (174516 => 174517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2014-10-09 19:05:51 UTC (rev 174516)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2014-10-09 19:16:05 UTC (rev 174517)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> void getTraitsInFamily(const AtomicString&, Vector<unsigned>&);
</span><span class="cx">
</span><del>- PassRefPtr<SimpleFontData> getCachedFontData(const FontDescription&, const AtomicString&, bool checkingAlternateName = false, ShouldRetain = Retain);
</del><ins>+ WEBCORE_EXPORT PassRefPtr<SimpleFontData> getCachedFontData(const FontDescription&, const AtomicString&, bool checkingAlternateName = false, ShouldRetain = Retain);
</ins><span class="cx"> WEBCORE_EXPORT PassRefPtr<SimpleFontData> getLastResortFallbackFont(const FontDescription&, ShouldRetain = Retain);
</span><span class="cx"> SimpleFontData* getNonRetainedLastResortFallbackFont(const FontDescription&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (174516 => 174517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-10-09 19:05:51 UTC (rev 174516)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-10-09 19:16:05 UTC (rev 174517)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove second-to-last client of WebFontCache
+ https://bugs.webkit.org/show_bug.cgi?id=137550
+
+ Reviewed by Darin Adler.
+
+ Use FontCache::getCachedFontData() instead of WebFontCache.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _addToStyle:fontA:fontB:]):
+
</ins><span class="cx"> 2014-10-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use is<>() / downcast<>() for Widget subclasses
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (174516 => 174517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-10-09 19:05:51 UTC (rev 174516)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-10-09 19:16:05 UTC (rev 174517)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> #import <WebCore/ExceptionHandlers.h>
</span><span class="cx"> #import <WebCore/FloatRect.h>
</span><span class="cx"> #import <WebCore/FocusController.h>
</span><ins>+#import <WebCore/FontCache.h>
</ins><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/FrameLoader.h>
</span><span class="cx"> #import <WebCore/FrameSelection.h>
</span><span class="lines">@@ -4894,13 +4895,16 @@
</span><span class="cx"> // the Postscript name.
</span><span class="cx">
</span><span class="cx"> // Find the font the same way the rendering code would later if it encountered this CSS.
</span><del>- NSFontTraitMask traits = aIsItalic ? NSFontItalicTrait : 0;
- int weight = aIsBold ? STANDARD_BOLD_WEIGHT : STANDARD_WEIGHT;
- NSFont *foundFont = [WebFontCache fontWithFamily:aFamilyName traits:traits weight:weight size:aPointSize];
</del><ins>+ FontDescription fontDescription;
+ fontDescription.setItalic(aIsItalic);
+ fontDescription.setWeight(aIsBold ? FontWeight900 : FontWeight500);
+ fontDescription.setSpecifiedSize(aPointSize);
+ FontCachePurgePreventer purgePreventer;
+ RefPtr<SimpleFontData> simpleFontData = fontCache().getCachedFontData(fontDescription, aFamilyName, false, WebCore::FontCache::DoNotRetain);
</ins><span class="cx">
</span><span class="cx"> // If we don't find a font with the same Postscript name, then we'll have to use the
</span><span class="cx"> // Postscript name to make the CSS specific enough.
</span><del>- if (![[foundFont fontName] isEqualToString:[a fontName]])
</del><ins>+ if (![[simpleFontData->platformData().font() fontName] isEqualToString:[a fontName]])
</ins><span class="cx"> familyNameForCSS = [a fontName];
</span><span class="cx">
</span><span class="cx"> // FIXME: Need more sophisticated escaping code if we want to handle family names
</span></span></pre>
</div>
</div>
</body>
</html>