<!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>[205714] branches/safari-602-branch</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/205714">205714</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-09-09 01:42:35 -0700 (Fri, 09 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204107">r204107</a>. rdar://problem/27860536</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestsfasttextsystemfontweightexpectedtxt">branches/safari-602-branch/LayoutTests/fast/text/system-font-weight-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsfasttextsystemfontweighthtml">branches/safari-602-branch/LayoutTests/fast/text/system-font-weight.html</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformgraphicsiosFontCacheIOSmm">branches/safari-602-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsplatformiossimulatorfasttextsystemfontweightexpectedtxt">branches/safari-602-branch/LayoutTests/platform/ios-simulator/fast/text/system-font-weight-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (205713 => 205714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-09-09 08:42:32 UTC (rev 205713)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-09-09 08:42:35 UTC (rev 205714)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-09-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204107. rdar://problem/27860536
+
+ 2016-08-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] SF-Heavy is not accessible from web content
+ https://bugs.webkit.org/show_bug.cgi?id=160522
+ <rdar://problem/27685273>
+
+ Reviewed by Simon Fraser.
+
+ * platform/ios-simulator/fast/text/system-font-weight-expected.txt: iOS 9 is not
+ expected to pass this test, but there is no way to specify that currently using
+ TestExpectations. Instead, we can create an iOS 9 specific result.
+ * fast/text/system-font-weight-expected.txt:
+ * fast/text/system-font-weight.html:
+
+2016-09-09 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r205388. rdar://problem/27806012
</span><span class="cx">
</span><span class="cx"> 2016-09-02 Ryan Haddad <ryanhaddad@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsfasttextsystemfontweightexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/fast/text/system-font-weight-expected.txt (205713 => 205714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/text/system-font-weight-expected.txt 2016-09-09 08:42:32 UTC (rev 205713)
+++ branches/safari-602-branch/LayoutTests/fast/text/system-font-weight-expected.txt 2016-09-09 08:42:35 UTC (rev 205714)
</span><span class="lines">@@ -3,8 +3,19 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS six.offsetWidth is not nine.offsetWidth
</del><ins>+PASS four.offsetWidth is not three.offsetWidth
+PASS five.offsetWidth is not four.offsetWidth
+PASS six.offsetWidth is not five.offsetWidth
+PASS eight.offsetWidth is not seven.offsetWidth
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-Hello, WorldHello, World
</del><ins>+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsfasttextsystemfontweighthtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/fast/text/system-font-weight.html (205713 => 205714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/text/system-font-weight.html 2016-09-09 08:42:32 UTC (rev 205713)
+++ branches/safari-602-branch/LayoutTests/fast/text/system-font-weight.html 2016-09-09 08:42:35 UTC (rev 205714)
</span><span class="lines">@@ -5,13 +5,31 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <div style="font: 19px -apple-system">
</span><del>-<span id="six" style="font-weight: 600;">Hello, World</span><span id="nine" style="font-weight: 900;">Hello, World</span>
</del><ins>+<div><span id="one" style="font-weight: 100;">Hello, World</span></div>
+<div><span id="two" style="font-weight: 200;">Hello, World</span></div>
+<div><span id="three" style="font-weight: 300;">Hello, World</span></div>
+<div><span id="four" style="font-weight: 400;">Hello, World</span></div>
+<div><span id="five" style="font-weight: 500;">Hello, World</span></div>
+<div><span id="six" style="font-weight: 600;">Hello, World</span></div>
+<div><span id="seven" style="font-weight: 700;">Hello, World</span></div>
+<div><span id="eight" style="font-weight: 800;">Hello, World</span></div>
+<div><span id="nine" style="font-weight: 900;">Hello, World</span></div>
</ins><span class="cx"> </div>
</span><span class="cx"> <script>
</span><span class="cx"> description("This test makes sure that extra-heavy weights of the system font can be achieved.");
</span><ins>+var one = document.getElementById("one");
+var two = document.getElementById("two");
+var three = document.getElementById("three");
+var four = document.getElementById("four");
+var five = document.getElementById("five");
</ins><span class="cx"> var six = document.getElementById("six");
</span><ins>+var seven = document.getElementById("seven");
+var eight = document.getElementById("eight");
</ins><span class="cx"> var nine = document.getElementById("nine");
</span><del>-shouldNotBe("six.offsetWidth", "nine.offsetWidth");
</del><ins>+shouldNotBe("four.offsetWidth", "three.offsetWidth");
+shouldNotBe("five.offsetWidth", "four.offsetWidth");
+shouldNotBe("six.offsetWidth", "five.offsetWidth");
+shouldNotBe("eight.offsetWidth", "seven.offsetWidth");
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformiossimulatorfasttextsystemfontweightexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/platform/ios-simulator/fast/text/system-font-weight-expected.txt (0 => 205714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/fast/text/system-font-weight-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/fast/text/system-font-weight-expected.txt 2016-09-09 08:42:35 UTC (rev 205714)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+This test makes sure that extra-heavy weights of the system font can be achieved.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS four.offsetWidth is not three.offsetWidth
+FAIL five.offsetWidth should not be 104.
+PASS six.offsetWidth is not five.offsetWidth
+FAIL eight.offsetWidth should not be 108.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
+Hello, World
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (205713 => 205714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-09 08:42:32 UTC (rev 205713)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-09 08:42:35 UTC (rev 205714)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-09-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204107. rdar://problem/27860536
+
+ 2016-08-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] SF-Heavy is not accessible from web content
+ https://bugs.webkit.org/show_bug.cgi?id=160522
+ <rdar://problem/27685273>
+
+ Reviewed by Simon Fraser.
+
+ The mappings we were using from CSS font-weight to CoreText font weight were inaccurate.
+ Instead, these new mappings should be used.
+
+ Test: fast/text/system-font-weight.html
+
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::systemFontModificationAttributes):
+
+2016-09-09 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r205381. rdar://problem/27806012
</span><span class="cx">
</span><span class="cx"> 2016-09-02 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformgraphicsiosFontCacheIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (205713 => 205714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2016-09-09 08:42:32 UTC (rev 205713)
+++ branches/safari-602-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2016-09-09 08:42:35 UTC (rev 205714)
</span><span class="lines">@@ -155,7 +155,17 @@
</span><span class="cx"> RetainPtr<NSMutableDictionary> traitsDictionary = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx">
</span><span class="cx"> ASSERT(weight >= FontWeight100 && weight <= FontWeight900);
</span><del>- float ctWeights[] = { -0.7, -0.5, -0.23, 0, 0.2, 0.3, 0.4, 0.6, 0.8 };
</del><ins>+ float ctWeights[] = {
+ static_cast<float>(kCTFontWeightUltraLight),
+ static_cast<float>(kCTFontWeightThin),
+ static_cast<float>(kCTFontWeightLight),
+ static_cast<float>(kCTFontWeightRegular),
+ static_cast<float>(kCTFontWeightMedium),
+ static_cast<float>(kCTFontWeightSemibold),
+ static_cast<float>(kCTFontWeightBold),
+ static_cast<float>(kCTFontWeightHeavy),
+ static_cast<float>(kCTFontWeightBlack)
+ };
</ins><span class="cx"> [traitsDictionary setObject:[NSNumber numberWithFloat:ctWeights[weight]] forKey:static_cast<NSString *>(kCTFontWeightTrait)];
</span><span class="cx">
</span><span class="cx"> [traitsDictionary setObject:@YES forKey:static_cast<NSString *>(kCTFontUIFontDesignTrait)];
</span></span></pre>
</div>
</div>
</body>
</html>