<!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>[184519] 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/184519">184519</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 16:16:15 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Addressing post-review comments on <a href="http://trac.webkit.org/projects/webkit/changeset/184353">r184353</a>
https://bugs.webkit.org/show_bug.cgi?id=145146
Reviewed by Benjamin Poulain.
Source/WebCore:
See per-file comments.
No new tests because there is no behavior change.
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::fontWithFamilySpecialCase): Use equalIgnoringASCIICase() AtomicString overload.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::updateCachedSystemFontDescription): Implement Ben's ideas for
cheaply constructing AtomicStrings only when necessary.
Source/WTF:
Create an overload for equalIgnoringASCIICase() for AtomicString and string literals.
* wtf/text/AtomicString.h:
(WTF::equalIgnoringASCIICase):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextAtomicStringh">trunk/Source/WTF/wtf/text/AtomicString.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm">trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (184518 => 184519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-05-18 23:01:08 UTC (rev 184518)
+++ trunk/Source/WTF/ChangeLog 2015-05-18 23:16:15 UTC (rev 184519)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-18 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Addressing post-review comments on r184353
+ https://bugs.webkit.org/show_bug.cgi?id=145146
+
+ Reviewed by Benjamin Poulain.
+
+ Create an overload for equalIgnoringASCIICase() for AtomicString and string literals.
+
+ * wtf/text/AtomicString.h:
+ (WTF::equalIgnoringASCIICase):
+
</ins><span class="cx"> 2015-05-18 Skachkov Alexandr <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Arrow function syntax. Feature flag for arrow function
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.h (184518 => 184519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.h 2015-05-18 23:01:08 UTC (rev 184518)
+++ trunk/Source/WTF/wtf/text/AtomicString.h 2015-05-18 23:16:15 UTC (rev 184519)
</span><span class="lines">@@ -290,6 +290,9 @@
</span><span class="cx"> inline bool equalIgnoringASCIICase(const AtomicString& a, const String& b) { return equalIgnoringASCIICase(a.impl(), b.impl()); }
</span><span class="cx"> inline bool equalIgnoringASCIICase(const String& a, const AtomicString& b) { return equalIgnoringASCIICase(a.impl(), b.impl()); }
</span><span class="cx">
</span><ins>+template <unsigned charactersCount>
+inline bool equalIgnoringASCIICase(const AtomicString& a, const char (&b)[charactersCount]) { return equalIgnoringASCIICase<charactersCount>(a.impl(), b); }
+
</ins><span class="cx"> // Define external global variables for the commonly used atomic strings.
</span><span class="cx"> // These are only usable from the main thread.
</span><span class="cx"> #ifndef ATOMICSTRING_HIDE_GLOBALS
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184518 => 184519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-18 23:01:08 UTC (rev 184518)
+++ trunk/Source/WebCore/ChangeLog 2015-05-18 23:16:15 UTC (rev 184519)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-05-18 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Addressing post-review comments on r184353
+ https://bugs.webkit.org/show_bug.cgi?id=145146
+
+ Reviewed by Benjamin Poulain.
+
+ See per-file comments.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::fontWithFamilySpecialCase): Use equalIgnoringASCIICase() AtomicString overload.
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::updateCachedSystemFontDescription): Implement Ben's ideas for
+ cheaply constructing AtomicStrings only when necessary.
+
</ins><span class="cx"> 2015-05-18 Skachkov Alexandr <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Arrow function syntax. Feature flag for arrow function
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (184518 => 184519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-05-18 23:01:08 UTC (rev 184518)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-05-18 23:16:15 UTC (rev 184519)
</span><span class="lines">@@ -225,9 +225,9 @@
</span><span class="cx">
</span><span class="cx"> static Optional<NSFont*> fontWithFamilySpecialCase(const AtomicString& family, FontWeight weight, float size)
</span><span class="cx"> {
</span><del>- if (equalIgnoringASCIICase(family.string(), "-webkit-system-font")
- || equalIgnoringASCIICase(family.string(), "-apple-system")
- || equalIgnoringASCIICase(family.string(), "-apple-system-font")) {
</del><ins>+ if (equalIgnoringASCIICase(family, "-webkit-system-font")
+ || equalIgnoringASCIICase(family, "-apple-system")
+ || equalIgnoringASCIICase(family, "-apple-system-font")) {
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> return [NSFont systemFontOfSize:size weight:toNSFontWeight(weight)];
</span><span class="cx"> #else
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (equalIgnoringASCIICase(family.string(), "-apple-system-monospaced-numbers")) {
</del><ins>+ if (equalIgnoringASCIICase(family, "-apple-system-monospaced-numbers")) {
</ins><span class="cx"> NSArray *featureArray = @[ @{ NSFontFeatureTypeIdentifierKey : @(kNumberSpacingType),
</span><span class="cx"> NSFontFeatureSelectorIdentifierKey : @(kMonospacedNumbersSelector) } ];
</span><span class="cx">
</span><span class="lines">@@ -244,10 +244,10 @@
</span><span class="cx"> return [NSFont fontWithDescriptor:desc size:size];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (equalIgnoringASCIICase(family.string(), "-apple-menu"))
</del><ins>+ if (equalIgnoringASCIICase(family, "-apple-menu"))
</ins><span class="cx"> return [NSFont menuFontOfSize:size];
</span><span class="cx">
</span><del>- if (equalIgnoringASCIICase(family.string(), "-apple-status-bar"))
</del><ins>+ if (equalIgnoringASCIICase(family, "-apple-status-bar"))
</ins><span class="cx"> return [NSFont labelFontOfSize:size];
</span><span class="cx">
</span><span class="cx"> return Optional<NSFont*>(Nullopt);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (184518 => 184519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-05-18 23:01:08 UTC (rev 184518)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-05-18 23:16:15 UTC (rev 184519)
</span><span class="lines">@@ -350,18 +350,18 @@
</span><span class="cx"> // System-font-ness can't be encapsulated by simply a font name. Instead, we must use a token
</span><span class="cx"> // which FontCache will look for.
</span><span class="cx"> // Make sure we keep this list of possible tokens in sync with FontCascade::primaryFontIsSystemFont()
</span><del>- String fontName(ASCIILiteral("-apple-system"));
</del><ins>+ AtomicString fontName;
</ins><span class="cx"> switch (cssValueId) {
</span><span class="cx"> case CSSValueSmallCaption:
</span><span class="cx"> font = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]];
</span><span class="cx"> break;
</span><span class="cx"> case CSSValueMenu:
</span><span class="cx"> font = [NSFont menuFontOfSize:[NSFont systemFontSize]];
</span><del>- fontName = String(ASCIILiteral("-apple-menu"));
</del><ins>+ fontName = AtomicString("-apple-menu", AtomicString::ConstructFromLiteral);
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueStatusBar:
</span><span class="cx"> font = [NSFont labelFontOfSize:[NSFont labelFontSize]];
</span><del>- fontName = String(ASCIILiteral("-apple-status-bar"));
</del><ins>+ fontName = AtomicString("-apple-status-bar", AtomicString::ConstructFromLiteral);
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueWebkitMiniControl:
</span><span class="cx"> font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSMiniControlSize]];
</span><span class="lines">@@ -379,6 +379,9 @@
</span><span class="cx"> if (!font)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (fontName.isNull())
+ fontName = AtomicString("-apple-system", AtomicString::ConstructFromLiteral);
+
</ins><span class="cx"> NSFontManager *fontManager = [NSFontManager sharedFontManager];
</span><span class="cx"> fontDescription.setIsAbsoluteSize(true);
</span><span class="cx"> fontDescription.setOneFamily(fontName);
</span></span></pre>
</div>
</div>
</body>
</html>