<!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>[187569] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187569">187569</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-07-29 17:47:34 -0700 (Wed, 29 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use rvalue references in FontCascade
https://bugs.webkit.org/show_bug.cgi?id=147427
Reviewed by Simon Fraser.
No new tests because there is no behavior change.
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::resolvesFamilyFor):
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::FontCascade):
(WebCore::retrieveOrAddCachedFonts):
(WebCore::FontCascade::update):
* platform/graphics/FontCascade.h:
* platform/graphics/FontCascadeFonts.cpp:
(WebCore::FontCascadeFonts::FontCascadeFonts):
* platform/graphics/FontCascadeFonts.h:
(WebCore::FontCascadeFonts::create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeFontscpp">trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeFontsh">trunk/Source/WebCore/platform/graphics/FontCascadeFonts.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187568 => 187569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-29 23:38:29 UTC (rev 187568)
+++ trunk/Source/WebCore/ChangeLog 2015-07-30 00:47:34 UTC (rev 187569)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-07-29 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ Use rvalue references in FontCascade
+ https://bugs.webkit.org/show_bug.cgi?id=147427
+
+ Reviewed by Simon Fraser.
+
+ No new tests because there is no behavior change.
+
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::resolvesFamilyFor):
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::FontCascade):
+ (WebCore::retrieveOrAddCachedFonts):
+ (WebCore::FontCascade::update):
+ * platform/graphics/FontCascade.h:
+ * platform/graphics/FontCascadeFonts.cpp:
+ (WebCore::FontCascadeFonts::FontCascadeFonts):
+ * platform/graphics/FontCascadeFonts.h:
+ (WebCore::FontCascadeFonts::create):
+
+2015-07-29 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> Rename FontDescriptionFontDataCacheKey to FontDescriptionKey
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147424
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (187568 => 187569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-07-29 23:38:29 UTC (rev 187568)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-07-30 00:47:34 UTC (rev 187569)
</span><span class="lines">@@ -593,10 +593,9 @@
</span><span class="cx"> continue;
</span><span class="cx"> if (m_fontFaces.contains(familyName))
</span><span class="cx"> return true;
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(String, webkitPrefix, ("-webkit-"));
- if (familyName.startsWith(webkitPrefix))
</del><ins>+ static NeverDestroyed<String> webkitPrefix("-webkit-");
+ if (familyName.startsWith(webkitPrefix.get()))
</ins><span class="cx"> return true;
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (187568 => 187569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-07-29 23:38:29 UTC (rev 187568)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-07-30 00:47:34 UTC (rev 187569)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static Ref<FontCascadeFonts> retrieveOrAddCachedFonts(const FontDescription&, PassRefPtr<FontSelector>);
</del><ins>+static Ref<FontCascadeFonts> retrieveOrAddCachedFonts(const FontDescription&, RefPtr<FontSelector>&&);
</ins><span class="cx">
</span><span class="cx"> const uint8_t FontCascade::s_roundingHackCharacterTable[256] = {
</span><span class="cx"> 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 /*\t*/, 1 /*\n*/, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: We should make this constructor platform-independent.
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-FontCascade::FontCascade(const FontPlatformData& fontData, PassRefPtr<FontSelector> fontSelector)
</del><ins>+FontCascade::FontCascade(const FontPlatformData& fontData, RefPtr<FontSelector>&& fontSelector)
</ins><span class="cx"> : m_weakPtrFactory(this)
</span><span class="cx"> , m_letterSpacing(0)
</span><span class="cx"> , m_wordSpacing(0)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> m_fontDescription.setComputedSize(CTFontGetSize(primaryFont));
</span><span class="cx"> m_fontDescription.setIsItalic(CTFontGetSymbolicTraits(primaryFont) & kCTFontTraitItalic);
</span><span class="cx"> m_fontDescription.setWeight((CTFontGetSymbolicTraits(primaryFont) & kCTFontTraitBold) ? FontWeightBold : FontWeightNormal);
</span><del>- m_fonts = retrieveOrAddCachedFonts(m_fontDescription, fontSelector.get());
</del><ins>+ m_fonts = retrieveOrAddCachedFonts(m_fontDescription, WTF::move(fontSelector));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> entry->fonts->pruneSystemFallbacks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<FontCascadeFonts> retrieveOrAddCachedFonts(const FontDescription& fontDescription, PassRefPtr<FontSelector> fontSelector)
</del><ins>+static Ref<FontCascadeFonts> retrieveOrAddCachedFonts(const FontDescription& fontDescription, RefPtr<FontSelector>&& fontSelector)
</ins><span class="cx"> {
</span><span class="cx"> auto key = makeFontCascadeCacheKey(fontDescription, fontSelector.get());
</span><span class="cx">
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> return addResult.iterator->value->fonts.get();
</span><span class="cx">
</span><span class="cx"> auto& newEntry = addResult.iterator->value;
</span><del>- newEntry = std::make_unique<FontCascadeCacheEntry>(WTF::move(key), FontCascadeFonts::create(fontSelector));
</del><ins>+ newEntry = std::make_unique<FontCascadeCacheEntry>(WTF::move(key), FontCascadeFonts::create(WTF::move(fontSelector)));
</ins><span class="cx"> Ref<FontCascadeFonts> glyphs = newEntry->fonts.get();
</span><span class="cx">
</span><span class="cx"> static const unsigned unreferencedPruneInterval = 50;
</span><span class="lines">@@ -318,9 +318,9 @@
</span><span class="cx"> return glyphs;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FontCascade::update(PassRefPtr<FontSelector> fontSelector) const
</del><ins>+void FontCascade::update(RefPtr<FontSelector>&& fontSelector) const
</ins><span class="cx"> {
</span><del>- m_fonts = retrieveOrAddCachedFonts(m_fontDescription, fontSelector.get());
</del><ins>+ m_fonts = retrieveOrAddCachedFonts(m_fontDescription, WTF::move(fontSelector));
</ins><span class="cx"> m_useBackslashAsYenSymbol = useBackslashAsYenSignForFamily(firstFamily());
</span><span class="cx"> m_typesettingFeatures = computeTypesettingFeatures();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (187568 => 187569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-07-29 23:38:29 UTC (rev 187568)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-07-30 00:47:34 UTC (rev 187569)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> int pixelSize() const { return fontDescription().computedPixelSize(); }
</span><span class="cx"> float size() const { return fontDescription().computedSize(); }
</span><span class="cx">
</span><del>- void update(PassRefPtr<FontSelector>) const;
</del><ins>+ void update(RefPtr<FontSelector>&&) const;
</ins><span class="cx">
</span><span class="cx"> enum CustomFontNotReadyAction { DoNotPaintIfFontNotReady, UseFallbackIfFontNotReady };
</span><span class="cx"> WEBCORE_EXPORT float drawText(GraphicsContext*, const TextRun&, const FloatPoint&, int from = 0, int to = -1, CustomFontNotReadyAction = DoNotPaintIfFontNotReady) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeFontscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp (187568 => 187569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp 2015-07-29 23:38:29 UTC (rev 187568)
+++ trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp 2015-07-30 00:47:34 UTC (rev 187569)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx">
</span><del>-FontCascadeFonts::FontCascadeFonts(PassRefPtr<FontSelector> fontSelector)
</del><ins>+FontCascadeFonts::FontCascadeFonts(RefPtr<FontSelector>&& fontSelector)
</ins><span class="cx"> : m_cachedPrimaryFont(nullptr)
</span><span class="cx"> , m_fontSelector(fontSelector)
</span><span class="cx"> , m_fontSelectorVersion(m_fontSelector ? m_fontSelector->version() : 0)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeFontsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascadeFonts.h (187568 => 187569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascadeFonts.h 2015-07-29 23:38:29 UTC (rev 187568)
+++ trunk/Source/WebCore/platform/graphics/FontCascadeFonts.h 2015-07-30 00:47:34 UTC (rev 187569)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> class FontCascadeFonts : public RefCounted<FontCascadeFonts> {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(FontCascadeFonts);
</span><span class="cx"> public:
</span><del>- static Ref<FontCascadeFonts> create(PassRefPtr<FontSelector> fontSelector) { return adoptRef(*new FontCascadeFonts(fontSelector)); }
</del><ins>+ static Ref<FontCascadeFonts> create(RefPtr<FontSelector>&& fontSelector) { return adoptRef(*new FontCascadeFonts(WTF::move(fontSelector))); }
</ins><span class="cx"> static Ref<FontCascadeFonts> createForPlatformFont(const FontPlatformData& platformData) { return adoptRef(*new FontCascadeFonts(platformData)); }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ~FontCascadeFonts();
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> void pruneSystemFallbacks();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FontCascadeFonts(PassRefPtr<FontSelector>);
</del><ins>+ FontCascadeFonts(RefPtr<FontSelector>&&);
</ins><span class="cx"> FontCascadeFonts(const FontPlatformData&);
</span><span class="cx">
</span><span class="cx"> GlyphData glyphDataForSystemFallback(UChar32, const FontDescription&, FontVariant);
</span></span></pre>
</div>
</div>
</body>
</html>