<!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>[197847] 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/197847">197847</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-03-09 00:54:56 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Arabic text on Wikipedia is shown as boxes
https://bugs.webkit.org/show_bug.cgi?id=155129
<rdar://problem/24919902>
Reviewed by Darin Adler.
Source/WebCore:
GeezaPro is the PostScript name, not the family name.
Test: fast/text/arabic-blacklisted.html
* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::platformLookupFallbackFont):
LayoutTests:
This test is iOS-specific.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
* fast/text/arabic-blacklisted-expected.html: Added.
* fast/text/arabic-blacklisted.html: Added.</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="#trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm">trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextarabicblacklistedexpectedhtml">trunk/LayoutTests/fast/text/arabic-blacklisted-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextarabicblacklistedhtml">trunk/LayoutTests/fast/text/arabic-blacklisted.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197846 => 197847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-09 08:46:47 UTC (rev 197846)
+++ trunk/LayoutTests/ChangeLog 2016-03-09 08:54:56 UTC (rev 197847)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] Arabic text on Wikipedia is shown as boxes
+ https://bugs.webkit.org/show_bug.cgi?id=155129
+ <rdar://problem/24919902>
+
+ Reviewed by Darin Adler.
+
+ This test is iOS-specific.
+
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+ * fast/text/arabic-blacklisted-expected.html: Added.
+ * fast/text/arabic-blacklisted.html: Added.
+
</ins><span class="cx"> 2016-03-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Element with maximum tabIndex cannot be returned by nextElementWithGreaterTabIndex()
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextarabicblacklistedexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/arabic-blacklisted-expected.html (0 => 197847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/arabic-blacklisted-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/arabic-blacklisted-expected.html 2016-03-09 08:54:56 UTC (rev 197847)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that Arabic blacklisted fonts properly fall back to Geeza Pro. The test passes if you see an Arabic character below (not a square).
+<div style="font: 100px GeezaPro;">&#x0645;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextarabicblacklistedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/arabic-blacklisted.html (0 => 197847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/arabic-blacklisted.html (rev 0)
+++ trunk/LayoutTests/fast/text/arabic-blacklisted.html 2016-03-09 08:54:56 UTC (rev 197847)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that Arabic blacklisted fonts properly fall back to Geeza Pro. The test passes if you see an Arabic character below (not a square).
+<div style="font: 100px Georgia;">&#x0645;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (197846 => 197847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2016-03-09 08:46:47 UTC (rev 197846)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2016-03-09 08:54:56 UTC (rev 197847)
</span><span class="lines">@@ -2824,8 +2824,9 @@
</span><span class="cx"> # Mocking the system language is not implemented in EFL.
</span><span class="cx"> fast/text/international/system-language [ Failure ]
</span><span class="cx"> fast/text/international/system-language/system-font-punctuation.html [ Missing ]
</span><del>-# This test relies on iOS-specific font fallback.
</del><ins>+# These tests rely on iOS-specific font fallback.
</ins><span class="cx"> fast/text/international/system-language/arabic-glyph-cache-fill-combine.html [ ImageOnlyFailure ]
</span><ins>+fast/text/arabic-blacklisted-expected.html [ Pass ImageOnlyFailure ]
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/149128 fast/text/control-characters [ ImageOnlyFailure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (197846 => 197847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-03-09 08:46:47 UTC (rev 197846)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-03-09 08:54:56 UTC (rev 197847)
</span><span class="lines">@@ -2703,3 +2703,6 @@
</span><span class="cx"> webkit.org/b/142548 editing/selection/extend-by-character-007.html [ Pass ]
</span><span class="cx">
</span><span class="cx"> fast/multicol/multicol-with-child-renderLayer-for-input.html [ Pass ]
</span><ins>+
+# This test relies on iOS-specific font fallback.
+fast/text/arabic-blacklisted-expected.html [ Pass ImageOnlyFailure ]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (197846 => 197847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-03-09 08:46:47 UTC (rev 197846)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-03-09 08:54:56 UTC (rev 197847)
</span><span class="lines">@@ -1202,8 +1202,9 @@
</span><span class="cx"> webkit.org/b/147390 [ Yosemite ElCapitan ] fast/text/fallback-language-han.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/147390 [ Yosemite ElCapitan ] fast/text/fallback-language-han-2.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-# This test relies on iOS-specific font fallback.
</del><ins>+# These tests rely on iOS-specific font fallback.
</ins><span class="cx"> [ Yosemite ElCapitan ] fast/text/international/system-language/arabic-glyph-cache-fill-combine.html [ Pass ImageOnlyFailure ]
</span><ins>+[ Yosemite ElCapitan ] fast/text/arabic-blacklisted-expected.html [ Pass ImageOnlyFailure ]
</ins><span class="cx">
</span><span class="cx"> # Started to fail after r188390
</span><span class="cx"> webkit.org/b/148042 http/tests/media/video-buffered-range-contains-currentTime.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (197846 => 197847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2016-03-09 08:46:47 UTC (rev 197846)
+++ trunk/LayoutTests/platform/win/TestExpectations 2016-03-09 08:54:56 UTC (rev 197847)
</span><span class="lines">@@ -3357,3 +3357,6 @@
</span><span class="cx">
</span><span class="cx"> # Same thing with the "lang" attribute.
</span><span class="cx"> webkit.org/b/137093 svg/custom/glyph-selection-lang-attribute.svg [ Failure ]
</span><ins>+
+# This test relies on iOS-specific font fallback.
+fast/text/arabic-blacklisted-expected.html [ Pass ImageOnlyFailure ]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197846 => 197847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-09 08:46:47 UTC (rev 197846)
+++ trunk/Source/WebCore/ChangeLog 2016-03-09 08:54:56 UTC (rev 197847)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] Arabic text on Wikipedia is shown as boxes
+ https://bugs.webkit.org/show_bug.cgi?id=155129
+ <rdar://problem/24919902>
+
+ Reviewed by Darin Adler.
+
+ GeezaPro is the PostScript name, not the family name.
+
+ Test: fast/text/arabic-blacklisted.html
+
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::platformLookupFallbackFont):
+
</ins><span class="cx"> 2016-03-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r197825.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (197846 => 197847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2016-03-09 08:46:47 UTC (rev 197846)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2016-03-09 08:54:56 UTC (rev 197847)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> auto familyName = adoptCF(static_cast<CFStringRef>(CTFontDescriptorCopyAttribute(fallbackFontDescriptor.get(), kCTFontFamilyNameAttribute)));
</span><span class="cx"> if (fontFamilyShouldNotBeUsedForArabic(familyName.get())) {
</span><span class="cx"> CFStringRef newFamilyName = isFontWeightBold(fontWeight) ? CFSTR("GeezaPro-Bold") : CFSTR("GeezaPro");
</span><del>- CFTypeRef keys[] = { kCTFontFamilyNameAttribute };
</del><ins>+ CFTypeRef keys[] = { kCTFontNameAttribute };
</ins><span class="cx"> CFTypeRef values[] = { newFamilyName };
</span><span class="cx"> RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><span class="cx"> fallbackFontDescriptor = adoptCF(CTFontDescriptorCreateCopyWithAttributes(fallbackFontDescriptor.get(), attributes.get()));
</span></span></pre>
</div>
</div>
</body>
</html>