<!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>[192372] 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/192372">192372</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-11-12 11:37:53 -0800 (Thu, 12 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Font fallback is not language-sensitive
https://bugs.webkit.org/show_bug.cgi?id=147390
Reviewed by Dean Jackson.
Source/WebCore:
This re-applies <a href="http://trac.webkit.org/projects/webkit/changeset/190754">r190754</a> in a somewhat more performant way.
Test: fast/text/fallback-language-han-2.html
* platform/graphics/Font.cpp:
(WebCore::CharacterFallbackMapKey::CharacterFallbackMapKey):
(WebCore::CharacterFallbackMapKey::operator==):
(WebCore::CharacterFallbackMapKeyHash::hash):
(WebCore::Font::systemFallbackFontForCharacter):
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::FontCache::systemFallbackForCharacters):
LayoutTests:
This patch adds a mismatch test to make sure a codepoint gets rendered differently given two different langs.
* fast/text/fallback-language-han-2-expected-mismatch.html: Added.
* fast/text/fallback-language-han-2.html: Added.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextfallbacklanguagehan2expectedmismatchhtml">trunk/LayoutTests/fast/text/fallback-language-han-2-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfasttextfallbacklanguagehan2html">trunk/LayoutTests/fast/text/fallback-language-han-2.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192371 => 192372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-12 19:22:02 UTC (rev 192371)
+++ trunk/LayoutTests/ChangeLog 2015-11-12 19:37:53 UTC (rev 192372)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-11-12 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Font fallback is not language-sensitive
+ https://bugs.webkit.org/show_bug.cgi?id=147390
+
+ Reviewed by Dean Jackson.
+
+ This patch adds a mismatch test to make sure a codepoint gets rendered differently given two different langs.
+
+ * fast/text/fallback-language-han-2-expected-mismatch.html: Added.
+ * fast/text/fallback-language-han-2.html: Added.
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+
</ins><span class="cx"> 2015-11-11 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> popstate event should be dispatched asynchronously
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfallbacklanguagehan2expectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/fallback-language-han-2-expected-mismatch.html (0 => 192372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/fallback-language-han-2-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/fast/text/fallback-language-han-2-expected-mismatch.html 2015-11-12 19:37:53 UTC (rev 192372)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+</html>
+<body>
+This test renders a character which should look different in Simplified and Traditional Chinese. It makes sure that the character looks different when passed a Simplified Chinese lang vs. a Traditional Chinese lang.
+<div style="font: 200px Helvetica;">
+<div lang="zh-hant">&#x96ea;</div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextfallbacklanguagehan2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/fallback-language-han-2.html (0 => 192372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/fallback-language-han-2.html (rev 0)
+++ trunk/LayoutTests/fast/text/fallback-language-han-2.html 2015-11-12 19:37:53 UTC (rev 192372)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+</html>
+<body>
+This test renders a character which should look different in Simplified and Traditional Chinese. It makes sure that the character looks different when passed a Simplified Chinese lang vs. a Traditional Chinese lang.
+<div style="font: 200px Helvetica;">
+<div lang="zh-hans">&#x96ea;</div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (192371 => 192372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2015-11-12 19:22:02 UTC (rev 192371)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2015-11-12 19:37:53 UTC (rev 192372)
</span><span class="lines">@@ -2356,6 +2356,7 @@
</span><span class="cx">
</span><span class="cx"> # This test hardcodes the result of a platform-dependent font lookup algorithm.
</span><span class="cx"> fast/text/fallback-language-han.html [ Skip ]
</span><ins>+fast/text/fallback-language-han-2.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # This test uses an MPEG-4 video
</span><span class="cx"> media/video-seek-to-current-time.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (192371 => 192372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-11-12 19:22:02 UTC (rev 192371)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-11-12 19:37:53 UTC (rev 192372)
</span><span class="lines">@@ -2559,6 +2559,7 @@
</span><span class="cx">
</span><span class="cx"> # This test hardcodes the result of a platform-dependent font lookup algorithm.
</span><span class="cx"> fast/text/fallback-language-han.html [ Skip ]
</span><ins>+fast/text/fallback-language-han-2.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # This test uses an MPEG-4 video
</span><span class="cx"> media/video-seek-to-current-time.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (192371 => 192372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-11-12 19:22:02 UTC (rev 192371)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-11-12 19:37:53 UTC (rev 192372)
</span><span class="lines">@@ -1269,6 +1269,7 @@
</span><span class="cx">
</span><span class="cx"> # Language-specific font fallback is disabled on certain versions of OS X
</span><span class="cx"> webkit.org/b/147390 [ Mavericks Yosemite ElCapitan ] fast/text/fallback-language-han.html [ ImageOnlyFailure ]
</span><ins>+webkit.org/b/147390 [ Mavericks Yosemite ElCapitan ] fast/text/fallback-language-han-2.html [ ImageOnlyFailure ]
</ins><span class="cx">
</span><span class="cx"> # This test relies on iOS-specific font fallback.
</span><span class="cx"> [ Mavericks Yosemite ElCapitan ] fast/text/international/system-language/arabic-glyph-cache-fill-combine.html [ Pass ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (192371 => 192372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2015-11-12 19:22:02 UTC (rev 192371)
+++ trunk/LayoutTests/platform/win/TestExpectations 2015-11-12 19:37:53 UTC (rev 192372)
</span><span class="lines">@@ -3188,6 +3188,7 @@
</span><span class="cx">
</span><span class="cx"> # This test hardcodes the result of a platform-dependent font lookup algorithm.
</span><span class="cx"> fast/text/fallback-language-han.html [ Skip ]
</span><ins>+fast/text/fallback-language-han-2.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # Changing system language is not supported.
</span><span class="cx"> fast/text/international/system-language [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192371 => 192372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-12 19:22:02 UTC (rev 192371)
+++ trunk/Source/WebCore/ChangeLog 2015-11-12 19:37:53 UTC (rev 192372)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-11-12 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Font fallback is not language-sensitive
+ https://bugs.webkit.org/show_bug.cgi?id=147390
+
+ Reviewed by Dean Jackson.
+
+ This re-applies r190754 in a somewhat more performant way.
+
+ Test: fast/text/fallback-language-han-2.html
+
+ * platform/graphics/Font.cpp:
+ (WebCore::CharacterFallbackMapKey::CharacterFallbackMapKey):
+ (WebCore::CharacterFallbackMapKey::operator==):
+ (WebCore::CharacterFallbackMapKeyHash::hash):
+ (WebCore::Font::systemFallbackFontForCharacter):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::FontCache::systemFallbackForCharacters):
+
</ins><span class="cx"> 2015-11-11 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> popstate event should be dispatched asynchronously
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (192371 => 192372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-11-12 19:22:02 UTC (rev 192371)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-11-12 19:37:53 UTC (rev 192372)
</span><span class="lines">@@ -394,8 +394,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CharacterFallbackMapKey(UChar32 character, bool isForPlatformFont)
- : character(character)
</del><ins>+ CharacterFallbackMapKey(const AtomicString& locale, UChar32 character, bool isForPlatformFont)
+ : locale(locale)
+ , character(character)
</ins><span class="cx"> , isForPlatformFont(isForPlatformFont)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -409,7 +410,7 @@
</span><span class="cx">
</span><span class="cx"> bool operator==(const CharacterFallbackMapKey& other) const
</span><span class="cx"> {
</span><del>- return character == other.character && isForPlatformFont == other.isForPlatformFont;
</del><ins>+ return locale == other.locale && character == other.character && isForPlatformFont == other.isForPlatformFont;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const bool emptyValueIsZero = true;
</span><span class="lines">@@ -417,6 +418,7 @@
</span><span class="cx"> private:
</span><span class="cx"> friend struct CharacterFallbackMapKeyHash;
</span><span class="cx">
</span><ins>+ AtomicString locale;
</ins><span class="cx"> UChar32 character { 0 };
</span><span class="cx"> bool isForPlatformFont { false };
</span><span class="cx"> };
</span><span class="lines">@@ -424,7 +426,11 @@
</span><span class="cx"> struct CharacterFallbackMapKeyHash {
</span><span class="cx"> static unsigned hash(const CharacterFallbackMapKey& key)
</span><span class="cx"> {
</span><del>- return WTF::pairIntHash(key.character, key.isForPlatformFont);
</del><ins>+ IntegerHasher hasher;
+ hasher.add(key.character);
+ hasher.add(key.isForPlatformFont);
+ hasher.add(key.locale.isNull() ? 0 : key.locale.impl()->existingHash());
+ return hasher.hash();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool equal(const CharacterFallbackMapKey& a, const CharacterFallbackMapKey& b)
</span><span class="lines">@@ -455,7 +461,7 @@
</span><span class="cx"> return FontCache::singleton().systemFallbackForCharacters(description, this, isForPlatformFont, &codeUnit, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto key = CharacterFallbackMapKey(character, isForPlatformFont);
</del><ins>+ auto key = CharacterFallbackMapKey(description.locale(), character, isForPlatformFont);
</ins><span class="cx"> auto characterAddResult = fontAddResult.iterator->value.add(WTF::move(key), nullptr);
</span><span class="cx">
</span><span class="cx"> Font*& fallbackFont = characterAddResult.iterator->value;
</span></span></pre>
</div>
</div>
</body>
</html>