<!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>[201982] trunk</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/201982">201982</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-06-11 18:14:58 -0700 (Sat, 11 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Addressing post-review comments after <a href="http://trac.webkit.org/projects/webkit/changeset/201978">r201978</a>.
https://bugs.webkit.org/show_bug.cgi?id=158649
<rdar://problem/13258122>
Unreviewed.
Source/WebCore:
* platform/graphics/FontCache.cpp:
(WebCore::FontCache::alternateFamilyName):
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::FontCache::platformAlternateFamilyName):
Source/WTF:
* wtf/text/StringCommon.h:
(WTF::equal):
(WTF::naiveEqualWithoutPerformingUnicodeNormalization): Deleted.
Tools:
* TestWebKitAPI/Tests/WTF/WTFString.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringCommonh">trunk/Source/WTF/wtf/text/StringCommon.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFWTFStringcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (201981 => 201982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-11 23:44:50 UTC (rev 201981)
+++ trunk/Source/WTF/ChangeLog 2016-06-12 01:14:58 UTC (rev 201982)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-06-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ Addressing post-review comments after r201978.
+ https://bugs.webkit.org/show_bug.cgi?id=158649
+ <rdar://problem/13258122>
+
+ Unreviewed.
+
+ * wtf/text/StringCommon.h:
+ (WTF::equal):
+ (WTF::naiveEqualWithoutPerformingUnicodeNormalization): Deleted.
+
+2016-06-11 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> [Cocoa] Map commonly used Chinese Windows font names to names present on Cocoa operating systems
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158649
</span><span class="cx"> <rdar://problem/13258122>
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringCommonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringCommon.h (201981 => 201982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringCommon.h 2016-06-11 23:44:50 UTC (rev 201981)
+++ trunk/Source/WTF/wtf/text/StringCommon.h 2016-06-12 01:14:58 UTC (rev 201982)
</span><span class="lines">@@ -323,15 +323,15 @@
</span><span class="cx"> return equal(*a, *b);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename StringClass, unsigned length> bool naiveEqualWithoutPerformingUnicodeNormalization(const StringClass& a, const UChar (&codepoints)[length])
</del><ins>+template<typename StringClass, unsigned length> bool equal(const StringClass& a, const UChar (&codeUnits)[length])
</ins><span class="cx"> {
</span><span class="cx"> if (a.length() != length)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (a.is8Bit())
</span><del>- return equal(a.characters8(), codepoints, length);
</del><ins>+ return equal(a.characters8(), codeUnits, length);
</ins><span class="cx">
</span><del>- return equal(a.characters16(), codepoints, length);
</del><ins>+ return equal(a.characters16(), codeUnits, length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterTypeA, typename CharacterTypeB>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201981 => 201982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-11 23:44:50 UTC (rev 201981)
+++ trunk/Source/WebCore/ChangeLog 2016-06-12 01:14:58 UTC (rev 201982)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Addressing post-review comments after r201978.
+ https://bugs.webkit.org/show_bug.cgi?id=158649
+ <rdar://problem/13258122>
+
+ Unreviewed.
+
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::alternateFamilyName):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::FontCache::platformAlternateFamilyName):
+
</ins><span class="cx"> 2016-06-11 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Tighten code to build set of tag names
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (201981 => 201982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2016-06-11 23:44:50 UTC (rev 201981)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2016-06-12 01:14:58 UTC (rev 201982)
</span><span class="lines">@@ -161,12 +161,12 @@
</span><span class="cx">
</span><span class="cx"> const AtomicString& FontCache::alternateFamilyName(const AtomicString& familyName)
</span><span class="cx"> {
</span><del>- static NeverDestroyed<AtomicString> helvetica("Helvetica", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> timesNewRoman("Times New Roman", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> courierNew("Courier New", AtomicString::ConstructFromLiteral);
</del><span class="cx"> static NeverDestroyed<AtomicString> arial("Arial", AtomicString::ConstructFromLiteral);
</span><span class="cx"> static NeverDestroyed<AtomicString> courier("Courier", AtomicString::ConstructFromLiteral);
</span><ins>+ static NeverDestroyed<AtomicString> courierNew("Courier New", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> helvetica("Helvetica", AtomicString::ConstructFromLiteral);
</ins><span class="cx"> static NeverDestroyed<AtomicString> times("Times", AtomicString::ConstructFromLiteral);
</span><ins>+ static NeverDestroyed<AtomicString> timesNewRoman("Times New Roman", AtomicString::ConstructFromLiteral);
</ins><span class="cx">
</span><span class="cx"> const AtomicString& platformSpecificAlternate = platformAlternateFamilyName(familyName);
</span><span class="cx"> if (!platformSpecificAlternate.isNull())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (201981 => 201982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-06-11 23:44:50 UTC (rev 201981)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-06-12 01:14:58 UTC (rev 201982)
</span><span class="lines">@@ -798,41 +798,41 @@
</span><span class="cx">
</span><span class="cx"> const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString& familyName)
</span><span class="cx"> {
</span><ins>+ static const UChar heitiString[] = { 0x9ed1, 0x4f53 };
</ins><span class="cx"> static const UChar songtiString[] = { 0x5b8b, 0x4f53 };
</span><ins>+ static const UChar weiruanXinXiMingTi[] = { 0x5fae, 0x8edf, 0x65b0, 0x7d30, 0x660e, 0x9ad4 };
</ins><span class="cx"> static const UChar weiruanYaHeiString[] = { 0x5fae, 0x8f6f, 0x96c5, 0x9ed1 };
</span><del>- static const UChar heitiString[] = { 0x9ed1, 0x4f53 };
</del><span class="cx"> static const UChar weiruanZhengHeitiString[] = { 0x5fae, 0x8edf, 0x6b63, 0x9ed1, 0x9ad4 };
</span><del>- static const UChar weiruanXinXiMingTi[] = { 0x5fae, 0x8edf, 0x65b0, 0x7d30, 0x660e, 0x9ad4 };
</del><span class="cx">
</span><span class="cx"> static NeverDestroyed<AtomicString> songtiSC("Songti SC", AtomicString::ConstructFromLiteral);
</span><span class="cx"> static NeverDestroyed<AtomicString> songtiTC("Songti TC", AtomicString::ConstructFromLiteral);
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+ static NeverDestroyed<AtomicString> heitiSCReplacement("Heiti SC", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> heitiTCReplacement("Heiti TC", AtomicString::ConstructFromLiteral);
+#else
</ins><span class="cx"> static NeverDestroyed<AtomicString> heitiSCReplacement("PingFang SC", AtomicString::ConstructFromLiteral);
</span><span class="cx"> static NeverDestroyed<AtomicString> heitiTCReplacement("PingFang TC", AtomicString::ConstructFromLiteral);
</span><del>-#else
- static NeverDestroyed<AtomicString> heitiSCReplacement("Heiti SC", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> heitiTCReplacement("Heiti TC", AtomicString::ConstructFromLiteral);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> switch (familyName.length()) {
</span><span class="cx"> case 2:
</span><del>- if (naiveEqualWithoutPerformingUnicodeNormalization(familyName, songtiString))
</del><ins>+ if (equal(familyName, songtiString))
</ins><span class="cx"> return songtiSC;
</span><del>- if (naiveEqualWithoutPerformingUnicodeNormalization(familyName, heitiString))
</del><ins>+ if (equal(familyName, heitiString))
</ins><span class="cx"> return heitiSCReplacement;
</span><span class="cx"> break;
</span><span class="cx"> case 4:
</span><del>- if (naiveEqualWithoutPerformingUnicodeNormalization(familyName, weiruanYaHeiString))
</del><ins>+ if (equal(familyName, weiruanYaHeiString))
</ins><span class="cx"> return heitiSCReplacement;
</span><span class="cx"> break;
</span><span class="cx"> case 5:
</span><del>- if (naiveEqualWithoutPerformingUnicodeNormalization(familyName, weiruanZhengHeitiString))
</del><ins>+ if (equal(familyName, weiruanZhengHeitiString))
</ins><span class="cx"> return heitiTCReplacement;
</span><span class="cx"> break;
</span><span class="cx"> case 6:
</span><span class="cx"> if (equalLettersIgnoringASCIICase(familyName, "simsun"))
</span><span class="cx"> return songtiSC;
</span><del>- if (naiveEqualWithoutPerformingUnicodeNormalization(familyName, weiruanXinXiMingTi))
</del><ins>+ if (equal(familyName, weiruanXinXiMingTi))
</ins><span class="cx"> return songtiTC;
</span><span class="cx"> break;
</span><span class="cx"> case 10:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (201981 => 201982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-11 23:44:50 UTC (rev 201981)
+++ trunk/Tools/ChangeLog 2016-06-12 01:14:58 UTC (rev 201982)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Addressing post-review comments after r201978.
+ https://bugs.webkit.org/show_bug.cgi?id=158649
+ <rdar://problem/13258122>
+
+ Unreviewed.
+
+ * TestWebKitAPI/Tests/WTF/WTFString.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-06-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed leak fix after r201863.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFWTFStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp (201981 => 201982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp 2016-06-11 23:44:50 UTC (rev 201981)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp 2016-06-12 01:14:58 UTC (rev 201982)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> ASSERT_EQ(string2.existingHash(), 0u);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WTF, StringNaiveUnicodeEqual)
</del><ins>+TEST(WTF, StringUnicodeEqualUCharArray)
</ins><span class="cx"> {
</span><span class="cx"> String string1("abc");
</span><span class="cx"> ASSERT_FALSE(string1.isNull());
</span><span class="lines">@@ -301,16 +301,16 @@
</span><span class="cx"> UChar abc[] = { 'a', 'b', 'c' };
</span><span class="cx"> UChar abcd[] = { 'a', 'b', 'c', 'd' };
</span><span class="cx"> UChar aBc[] = { 'a', 'B', 'c' };
</span><del>- ASSERT_FALSE(naiveEqualWithoutPerformingUnicodeNormalization(string1, ab));
- ASSERT_TRUE(naiveEqualWithoutPerformingUnicodeNormalization(string1, abc));
- ASSERT_FALSE(naiveEqualWithoutPerformingUnicodeNormalization(string1, abcd));
- ASSERT_FALSE(naiveEqualWithoutPerformingUnicodeNormalization(string1, aBc));
</del><ins>+ ASSERT_FALSE(equal(string1, ab));
+ ASSERT_TRUE(equal(string1, abc));
+ ASSERT_FALSE(equal(string1, abcd));
+ ASSERT_FALSE(equal(string1, aBc));
</ins><span class="cx">
</span><span class="cx"> String string2(abc, 3);
</span><del>- ASSERT_FALSE(naiveEqualWithoutPerformingUnicodeNormalization(string2, ab));
- ASSERT_TRUE(naiveEqualWithoutPerformingUnicodeNormalization(string2, abc));
- ASSERT_FALSE(naiveEqualWithoutPerformingUnicodeNormalization(string2, abcd));
- ASSERT_FALSE(naiveEqualWithoutPerformingUnicodeNormalization(string2, aBc));
</del><ins>+ ASSERT_FALSE(equal(string2, ab));
+ ASSERT_TRUE(equal(string2, abc));
+ ASSERT_FALSE(equal(string2, abcd));
+ ASSERT_FALSE(equal(string2, aBc));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>