<!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>[212985] 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/212985">212985</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2017-02-24 18:07:12 -0800 (Fri, 24 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Alias "system-ui" for the System font name
https://bugs.webkit.org/show_bug.cgi?id=151493
Reviewed by Tim Horton and Joseph Pecoraro.
Source/WebCore:
Updated existing tests.
* WebCore.xcodeproj/project.pbxproj: Add WebKitFontFamilyNames.in for
convenience.
* css/CSSValueKeywords.in: Add system-ui as a keyword.
* css/WebKitFontFamilyNames.in: Add system-ui.
* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::platformFontWithFamilySpecialCase): Include "system-ui" as an
alias.
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::platformFontWithFamilySpecialCase): Ditto.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::updateCachedSystemFontDescription): Update
serialization to "system-ui" from "-apple-system".
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::identifierForFamily):
* css/CSSFontFaceSet.cpp:
(WebCore::CSSFontFaceSet::familyNameFromPrimitive):
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueFontFamily):
Source/WebInspectorUI:
* UserInterface/Models/CSSKeywordCompletions.js: Ditto.
LayoutTests:
Add "system-ui" to the test.
* fast/css/font-family-builtins.html:
* fast/css/font-family-builtins-expected.txt:
* fast/text/system-font-features.html:
* fast/text/system-font-features-expected.html:
* fast/text/system-font-legacy-name.html:
* fast/text/system-font-legacy-name-expected.txt:
* platform/ios-simulator/ios/fast/text/opticalFont.html:
* platform/ios-simulator/ios/fast/text/opticalFont-expected.txt:
* platform/ios-simulator/ios/fast/text/opticalFontWithTextStyle-expected.txt:
Unskip opticalFont* tests.
* platform/ios-simulator/TestExpectations:
Update tests to use "system-ui" instead of "-apple-system" or the even
older "-apple-system-font".
* fast/css/multiple-tabs-expected.html:
* fast/css/multiple-tabs.html:
* fast/text/international/system-language/han-quotes-expected-mismatch.html:
* fast/text/international/system-language/han-quotes.html:
* fast/text/international/system-language/hindi-system-font-punctuation-expected.html:
* fast/text/international/system-language/hindi-system-font-punctuation.html:
* fast/text/letterpress-different-expected-mismatch.html:
* fast/text/letterpress-different.html:
* fast/text/letterpress-paint.html:
* fast/text/system-font-weight-italic.html:
* fast/text/system-font-weight.html:
* fast/text/text-node-remains-dirty-after-calling-surroundContents-expected.html:
* fast/text/text-node-remains-dirty-after-calling-surroundContents.html:
* fast/text/trak-optimizeLegibility.html:
* fast/text/weighted-italicized-system-font-expected.html:
* fast/text/weighted-italicized-system-font.html:
* platform/ios-simulator/ios/fast/text/apple-logo.html:
* platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt:
* platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html:
* platform/ios-simulator/ios/fast/text/underline-scaling.html:
* platform/mac/fast/css/css2-system-fonts-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssfontfamilybuiltinsexpectedtxt">trunk/LayoutTests/fast/css/font-family-builtins-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontfamilybuiltinshtml">trunk/LayoutTests/fast/css/font-family-builtins.html</a></li>
<li><a href="#trunkLayoutTestsfastcssmultipletabsexpectedhtml">trunk/LayoutTests/fast/css/multiple-tabs-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssmultipletabshtml">trunk/LayoutTests/fast/css/multiple-tabs.html</a></li>
<li><a href="#trunkLayoutTestsfasttextinternationalsystemlanguagehanquotesexpectedmismatchhtml">trunk/LayoutTests/fast/text/international/system-language/han-quotes-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfasttextinternationalsystemlanguagehanquoteshtml">trunk/LayoutTests/fast/text/international/system-language/han-quotes.html</a></li>
<li><a href="#trunkLayoutTestsfasttextinternationalsystemlanguagehindisystemfontpunctuationexpectedhtml">trunk/LayoutTests/fast/text/international/system-language/hindi-system-font-punctuation-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextinternationalsystemlanguagehindisystemfontpunctuationhtml">trunk/LayoutTests/fast/text/international/system-language/hindi-system-font-punctuation.html</a></li>
<li><a href="#trunkLayoutTestsfasttextletterpressdifferentexpectedmismatchhtml">trunk/LayoutTests/fast/text/letterpress-different-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfasttextletterpressdifferenthtml">trunk/LayoutTests/fast/text/letterpress-different.html</a></li>
<li><a href="#trunkLayoutTestsfasttextletterpresspainthtml">trunk/LayoutTests/fast/text/letterpress-paint.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsystemfontfeaturesexpectedhtml">trunk/LayoutTests/fast/text/system-font-features-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsystemfontfeatureshtml">trunk/LayoutTests/fast/text/system-font-features.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsystemfontlegacynameexpectedtxt">trunk/LayoutTests/fast/text/system-font-legacy-name-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextsystemfontlegacynamehtml">trunk/LayoutTests/fast/text/system-font-legacy-name.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsystemfontweightitalichtml">trunk/LayoutTests/fast/text/system-font-weight-italic.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsystemfontweighthtml">trunk/LayoutTests/fast/text/system-font-weight.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextnoderemainsdirtyaftercallingsurroundContentsexpectedhtml">trunk/LayoutTests/fast/text/text-node-remains-dirty-after-calling-surroundContents-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextnoderemainsdirtyaftercallingsurroundContentshtml">trunk/LayoutTests/fast/text/text-node-remains-dirty-after-calling-surroundContents.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttrakoptimizeLegibilityhtml">trunk/LayoutTests/fast/text/trak-optimizeLegibility.html</a></li>
<li><a href="#trunkLayoutTestsfasttextweighteditalicizedsystemfontexpectedhtml">trunk/LayoutTests/fast/text/weighted-italicized-system-font-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextweighteditalicizedsystemfonthtml">trunk/LayoutTests/fast/text/weighted-italicized-system-font.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriosfasttextapplelogohtml">trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriosfasttextopticalFontexpectedtxt">trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriosfasttextopticalFonthtml">trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriosfasttextopticalFontWithTextStyleexpectedtxt">trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithTextStyle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriosfasttextopticalFontWithWeightexpectedtxt">trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriosfasttextopticalFontWithWeighthtml">trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoriosfasttextunderlinescalinghtml">trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsscss2systemfontsexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSetcpp">trunk/Source/WebCore/css/CSSFontFaceSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitFontFamilyNamesin">trunk/Source/WebCore/css/WebKitFontFamilyNames.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm">trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm</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>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/ChangeLog 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2017-02-24 Jon Lee <jonlee@apple.com>
+
+ Alias "system-ui" for the System font name
+ https://bugs.webkit.org/show_bug.cgi?id=151493
+
+ Reviewed by Tim Horton and Joseph Pecoraro.
+
+ Add "system-ui" to the test.
+ * fast/css/font-family-builtins.html:
+ * fast/css/font-family-builtins-expected.txt:
+ * fast/text/system-font-features.html:
+ * fast/text/system-font-features-expected.html:
+ * fast/text/system-font-legacy-name.html:
+ * fast/text/system-font-legacy-name-expected.txt:
+ * platform/ios-simulator/ios/fast/text/opticalFont.html:
+ * platform/ios-simulator/ios/fast/text/opticalFont-expected.txt:
+ * platform/ios-simulator/ios/fast/text/opticalFontWithTextStyle-expected.txt:
+
+ Unskip opticalFont* tests.
+ * platform/ios-simulator/TestExpectations:
+
+ Update tests to use "system-ui" instead of "-apple-system" or the even
+ older "-apple-system-font".
+ * fast/css/multiple-tabs-expected.html:
+ * fast/css/multiple-tabs.html:
+ * fast/text/international/system-language/han-quotes-expected-mismatch.html:
+ * fast/text/international/system-language/han-quotes.html:
+ * fast/text/international/system-language/hindi-system-font-punctuation-expected.html:
+ * fast/text/international/system-language/hindi-system-font-punctuation.html:
+ * fast/text/letterpress-different-expected-mismatch.html:
+ * fast/text/letterpress-different.html:
+ * fast/text/letterpress-paint.html:
+ * fast/text/system-font-weight-italic.html:
+ * fast/text/system-font-weight.html:
+ * fast/text/text-node-remains-dirty-after-calling-surroundContents-expected.html:
+ * fast/text/text-node-remains-dirty-after-calling-surroundContents.html:
+ * fast/text/trak-optimizeLegibility.html:
+ * fast/text/weighted-italicized-system-font-expected.html:
+ * fast/text/weighted-italicized-system-font.html:
+ * platform/ios-simulator/ios/fast/text/apple-logo.html:
+ * platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt:
+ * platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html:
+ * platform/ios-simulator/ios/fast/text/underline-scaling.html:
+ * platform/mac/fast/css/css2-system-fonts-expected.txt:
+
</ins><span class="cx"> 2017-02-24 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] <audio> controls should center in their container when the page is scaled
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontfamilybuiltinsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/font-family-builtins-expected.txt (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/font-family-builtins-expected.txt 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/css/font-family-builtins-expected.txt 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -3,4 +3,5 @@
</span><span class="cx"> PASS: The computed style for a specified font-family of 'cursive' matched.
</span><span class="cx"> PASS: The computed style for a specified font-family of 'fantasy' matched.
</span><span class="cx"> PASS: The computed style for a specified font-family of 'monospace' matched.
</span><ins>+PASS: The computed style for a specified font-family of 'system-ui' matched.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontfamilybuiltinshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/font-family-builtins.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/font-family-builtins.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/css/font-family-builtins.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -15,7 +15,8 @@
</span><span class="cx"> "sans-serif",
</span><span class="cx"> "cursive",
</span><span class="cx"> "fantasy",
</span><del>- "monospace"
</del><ins>+ "monospace",
+ "system-ui"
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> window.onload = function()
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssmultipletabsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/multiple-tabs-expected.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/multiple-tabs-expected.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/css/multiple-tabs-expected.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<b>Apple system font.</b>
-<div style="font: 12.000000px -apple-system-font;">
</del><ins>+<b>System font.</b>
+<div style="font: 12.000000px system-ui;">
</ins><span class="cx"> <span style="white-space: pre"> x</span>
</span><span class="cx"> <br>
</span><span class="cx"> <span style="white-space: pre"> x</span>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssmultipletabshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/multiple-tabs.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/multiple-tabs.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/css/multiple-tabs.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- setupBlock("Apple system font.", "font: 12.000000px -apple-system-font;");
</del><ins>+ setupBlock("System font.", "font: 12.000000px system-ui;");
</ins><span class="cx"> setupBlock("Noteworthy.", "font: 18.000000px Noteworthy-Light;");
</span><span class="cx"> setupBlock("Helvetica.", "font: 24.000000px Helvetica;");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextinternationalsystemlanguagehanquotesexpectedmismatchhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/international/system-language/han-quotes-expected-mismatch.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/international/system-language/han-quotes-expected-mismatch.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/international/system-language/han-quotes-expected-mismatch.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -3,6 +3,6 @@
</span><span class="cx"> <head>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div style="font: 200px -apple-system;">&#x201c;</div>
</del><ins>+<div style="font: 200px system-ui;">&#x201c;</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextinternationalsystemlanguagehanquoteshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/international/system-language/han-quotes.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/international/system-language/han-quotes.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/international/system-language/han-quotes.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -3,6 +3,6 @@
</span><span class="cx"> <head>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div style="font: 200px -apple-system;">&#x201c;</div>
</del><ins>+<div style="font: 200px system-ui;">&#x201c;</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextinternationalsystemlanguagehindisystemfontpunctuationexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/international/system-language/hindi-system-font-punctuation-expected.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/international/system-language/hindi-system-font-punctuation-expected.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/international/system-language/hindi-system-font-punctuation-expected.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <!DOCTYPE html><!-- webkit-test-runner [ language=hi ] -->
</span><span class="cx"> <html>
</span><del>-<body style="font-family: -apple-system; text-rendering: optimizeSpeed;">
</del><ins>+<body style="font-family: system-ui; text-rendering: optimizeSpeed;">
</ins><span class="cx"> This test makes sure that punctuation next to Hindi characters are rendered as expected when the system language is set to Japanese.
</span><span class="cx"> The test passes when the character below looks like a "(" character.
</span><span class="cx"> <div style="overflow: hidden; width: 40px; height: 400px;">
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextinternationalsystemlanguagehindisystemfontpunctuationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/international/system-language/hindi-system-font-punctuation.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/international/system-language/hindi-system-font-punctuation.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/international/system-language/hindi-system-font-punctuation.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <!DOCTYPE html><!-- webkit-test-runner [ language=hi ] -->
</span><span class="cx"> <html>
</span><del>-<body style="font-family: -apple-system; text-rendering: optimizeSpeed;">
</del><ins>+<body style="font-family: system-ui; text-rendering: optimizeSpeed;">
</ins><span class="cx"> This test makes sure that punctuation next to Hindi characters are rendered as expected when the system language is set to Japanese.
</span><span class="cx"> The test passes when the character below looks like a "(" character.
</span><span class="cx"> <div style="overflow: hidden; width: 40px; height: 400px;"><!-- Covers up the "&#x928;)" -->
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextletterpressdifferentexpectedmismatchhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/letterpress-different-expected-mismatch.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/letterpress-different-expected-mismatch.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/letterpress-different-expected-mismatch.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -3,6 +3,6 @@
</span><span class="cx"> <head>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div style="font: 17px -apple-system;">Test passes if this text has a letterpress effect.</div>
</del><ins>+<div style="font: 17px system-ui;">Test passes if this text has a letterpress effect.</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextletterpressdifferenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/letterpress-different.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/letterpress-different.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/letterpress-different.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -3,6 +3,6 @@
</span><span class="cx"> <head>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div style="font: 17px -apple-system; text-decoration: -webkit-letterpress;">Test passes if this text has a letterpress effect.</div>
</del><ins>+<div style="font: 17px system-ui; text-decoration: -webkit-letterpress;">Test passes if this text has a letterpress effect.</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextletterpresspainthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/letterpress-paint.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/letterpress-paint.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/letterpress-paint.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -3,6 +3,6 @@
</span><span class="cx"> <head>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div style="font: 17px -apple-system; text-decoration: -webkit-letterpress;">Test passes if something paints.</div>
</del><ins>+<div style="font: 17px system-ui; text-decoration: -webkit-letterpress;">Test passes if something paints.</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsystemfontfeaturesexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/system-font-features-expected.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/system-font-features-expected.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/system-font-features-expected.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -3,7 +3,8 @@
</span><span class="cx"> <head>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-This test makes sure that font features are applied to -apple-system.
</del><ins>+This test makes sure that font features are applied to -apple-system and system-ui.
</ins><span class="cx"> <div style="font: 50px -apple-system-monospaced-numbers;">0123456789</div>
</span><ins>+<div style="font: 50px -apple-system-monospaced-numbers;">0123456789</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsystemfontfeatureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/system-font-features.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/system-font-features.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/system-font-features.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -3,7 +3,8 @@
</span><span class="cx"> <head>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-This test makes sure that font features are applied to -apple-system.
</del><ins>+This test makes sure that font features are applied to -apple-system and system-ui.
</ins><span class="cx"> <div style="font: 50px -apple-system; font-variant-numeric: tabular-nums;">0123456789</div>
</span><ins>+<div style="font: 50px system-ui; font-variant-numeric: tabular-nums;">0123456789</div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsystemfontlegacynameexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/system-font-legacy-name-expected.txt (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/system-font-legacy-name-expected.txt 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/system-font-legacy-name-expected.txt 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1,7 +1,10 @@
</span><del>-These next two lines should be the same width
</del><ins>+These next three lines should be the same width
</ins><span class="cx">
</span><span class="cx"> This is some text
</span><span class="cx">
</span><span class="cx"> This is some text
</span><span class="cx">
</span><del>-PASS: widths were the same
</del><ins>+This is some text
+
+PASS: system-ui and -apple-system widths were the same
+PASS: system-ui and -apple-system-font widths were the same
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsystemfontlegacynamehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/system-font-legacy-name.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/system-font-legacy-name.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/system-font-legacy-name.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -4,12 +4,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #a {
</span><ins>+ font-family: system-ui;
+}
+
+#b {
</ins><span class="cx"> font-family: -apple-system;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#b {
</del><ins>+#c {
</ins><span class="cx"> font-family: -apple-system-font;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner)
</span><span class="lines">@@ -20,19 +25,27 @@
</span><span class="cx"> function run() {
</span><span class="cx"> var a = document.getElementById("a");
</span><span class="cx"> var b = document.getElementById("b");
</span><ins>+ var c = document.getElementById("c");
</ins><span class="cx"> var result = document.getElementById("result");
</span><span class="cx">
</span><span class="cx"> var aRect = a.getBoundingClientRect();
</span><span class="cx"> var bRect = b.getBoundingClientRect();
</span><ins>+ var cRect = c.getBoundingClientRect();
</ins><span class="cx">
</span><span class="cx"> if (aRect.width == bRect.width)
</span><del>- result.textContent = "PASS: widths were the same";
</del><ins>+ result.innerHTML = "PASS: system-ui and -apple-system widths were the same";
</ins><span class="cx"> else
</span><del>- result.textContent = "FAIL: widths were not the same";
</del><ins>+ result.innerHTML = "FAIL: system-ui and -apple-system widths were not the same";
+
+ if (aRect.width == cRect.width)
+ result.innerHTML += "<br/>PASS: system-ui and -apple-system-font widths were the same";
+ else
+ result.innerHTML += "<br/>FAIL: system-ui and -apple-system-font widths were not the same";
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<p>These next two lines should be the same width</p>
</del><ins>+<p>These next three lines should be the same width</p>
</ins><span class="cx"> <p><span id="a">This is some text</span></p>
</span><span class="cx"> <p><span id="b">This is some text</span></p>
</span><ins>+<p><span id="c">This is some text</span></p>
</ins><span class="cx">
</span><span class="cx"> <p id="result"></p>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsystemfontweightitalichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/system-font-weight-italic.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/system-font-weight-italic.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/system-font-weight-italic.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div style="font: 19px -apple-system">
</del><ins>+<div style="font: 19px system-ui">
</ins><span class="cx"> <div style="font-style: italic;"><span id="six" style="font-weight: 600;">Hello, World</span><span id="nine" style="font-weight: 900;">Hello, World</span></div>
</span><span class="cx"> </div>
</span><span class="cx"> <script>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsystemfontweighthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/system-font-weight.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/system-font-weight.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/system-font-weight.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div style="font: 19px -apple-system">
</del><ins>+<div style="font: 19px system-ui">
</ins><span class="cx"> <div><span id="one" style="font-weight: 100;">Hello, World</span></div>
</span><span class="cx"> <div><span id="two" style="font-weight: 200;">Hello, World</span></div>
</span><span class="cx"> <div><span id="three" style="font-weight: 300;">Hello, World</span></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexttextnoderemainsdirtyaftercallingsurroundContentsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/text-node-remains-dirty-after-calling-surroundContents-expected.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-node-remains-dirty-after-calling-surroundContents-expected.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/text-node-remains-dirty-after-calling-surroundContents-expected.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <title>This tests that the span content gets properly laid out after calling surroundContents.</title>
</span><span class="cx"> <style>
</span><span class="cx"> span {
</span><del>- font-family: -apple-system;
</del><ins>+ font-family: system-ui;
</ins><span class="cx"> font-size: 12px;
</span><span class="cx"> margin-right: 2px;
</span><span class="cx"> text-decoration: underline;
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexttextnoderemainsdirtyaftercallingsurroundContentshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/text-node-remains-dirty-after-calling-surroundContents.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-node-remains-dirty-after-calling-surroundContents.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/text-node-remains-dirty-after-calling-surroundContents.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <title>This tests that the span content gets properly laid out after calling surroundContents.</title>
</span><span class="cx"> <style>
</span><span class="cx"> span {
</span><del>- font-family: -apple-system;
</del><ins>+ font-family: system-ui;
</ins><span class="cx"> font-size: 12px;
</span><span class="cx"> margin-right: 2px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexttrakoptimizeLegibilityhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/trak-optimizeLegibility.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/trak-optimizeLegibility.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/trak-optimizeLegibility.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> <body>
</span><span class="cx"> This test makes sure that you can opt-in to honoring the 'trak' table by specifying text-rendering: optimizeLegibility.
</span><span class="cx"> The first and third lines below should have the same width. The middle one can (but doesn't have to) have a different width.
</span><del>-<p><span id="first" style="font: 100px '-apple-system'; font-weight: 300;">hamburgefonstiv</span></p>
</del><ins>+<p><span id="first" style="font: 100px 'system-ui'; font-weight: 300;">hamburgefonstiv</span></p>
</ins><span class="cx"> <p><span id="second" style="font: 100px '.AppleSystemUIFontLight', '.SFNSText-Light', '.SFUIDisplay-Light';">hamburgefonstiv</span></p>
</span><span class="cx"> <p><span id="third" style="font: 100px '.AppleSystemUIFontLight', '.SFNSText-Light', '.SFUIDisplay-Light'; text-rendering: optimizeLegibility;">hamburgefonstiv</span></p>
</span><span class="cx"> <script>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextweighteditalicizedsystemfontexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/weighted-italicized-system-font-expected.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/weighted-italicized-system-font-expected.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/weighted-italicized-system-font-expected.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> This test makes sure that bold &amp; thin italicized system fonts render without synthetic bold.
</span><del>-<div style="font: 100px -apple-system; font-style: italic;">
</del><ins>+<div style="font: 100px system-ui; font-style: italic;">
</ins><span class="cx"> <span style="font-weight: 100;">a</span>
</span><span class="cx"> <span style="font-weight: 700;">a</span>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextweighteditalicizedsystemfonthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/weighted-italicized-system-font.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/weighted-italicized-system-font.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/fast/text/weighted-italicized-system-font.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> This test makes sure that bold &amp; thin italicized system fonts render without synthetic bold.
</span><del>-<div style="font: 100px -apple-system; font-synthesis: none; font-style: italic;">
</del><ins>+<div style="font: 100px system-ui; font-synthesis: none; font-style: italic;">
</ins><span class="cx"> <span style="font-weight: 100;">a</span>
</span><span class="cx"> <span style="font-weight: 700;">a</span>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -2118,9 +2118,6 @@
</span><span class="cx"> platform/ios-simulator/ios/fast/text/emoji-text.html [ Failure ]
</span><span class="cx"> platform/ios-simulator/ios/fast/text/line-breaking-with-kerning.html [ Failure ]
</span><span class="cx"> platform/ios-simulator/ios/fast/text/mid-word-break-before-combining-mark.html [ Failure ]
</span><del>-platform/ios-simulator/ios/fast/text/opticalFont.html [ Failure ]
-platform/ios-simulator/ios/fast/text/opticalFontWithTextStyle.html [ Failure ]
-platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html [ Failure ]
</del><span class="cx"> platform/ios-simulator/ios/fast/text/textStylesWithSizes.html [ Failure ]
</span><span class="cx"> platform/ios-simulator/ios/fixed/absolute-inside-fixed.html [ Failure ]
</span><span class="cx"> platform/ios-simulator/ios/fixed/four-bars.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriosfasttextapplelogohtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> <span style="font-size: 20px; font: -apple-system-body; font-family: 'Times New Roman';"></span>
</span><span class="cx"> <span style="font-size: 20px; font: -apple-system-body; font-family: 'Times New Roman'; font-style: italic;"></span>
</span><span class="cx"> <span style="font: -apple-system-body; font-size: 20px; font-family: 'Times New Roman';"></span>
</span><del>-<span style="font-family: -apple-system;"></span>
-<span style="font-size: 20px; font-family: -apple-system;"></span>
-<span style="font-size: 20px; font-family: -apple-system; font-weight: bold"></span>
-<span style="font-size: 20px; font-family: -apple-system; font-style: italic"></span>
</del><ins>+<span style="font-family: system-ui;"></span>
+<span style="font-size: 20px; font-family: system-ui;"></span>
+<span style="font-size: 20px; font-family: system-ui; font-weight: bold"></span>
+<span style="font-size: 20px; font-family: system-ui; font-style: italic"></span>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriosfasttextopticalFontexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont-expected.txt (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont-expected.txt 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont-expected.txt 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1,56 +1,60 @@
</span><del>-layer at (0,0) size 800x1152
</del><ins>+layer at (0,0) size 800x1233
</ins><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x1152
- RenderBlock {HTML} at (0,0) size 800x1152
- RenderBody {BODY} at (8,8) size 784x1136
</del><ins>+layer at (0,0) size 800x1233
+ RenderBlock {HTML} at (0,0) size 800x1233
+ RenderBody {BODY} at (8,8) size 784x1217
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 784x29
</span><del>- RenderText {#text} at (0,0) size 392x29
- text run at (0,0) width 392: "This is a test for -webkit-system-font"
</del><ins>+ RenderText {#text} at (0,0) size 397x29
+ text run at (0,0) width 397: "This is a test for -webkit-system-font"
</ins><span class="cx"> RenderBlock {DIV} at (0,29) size 784x29
</span><del>- RenderText {#text} at (0,0) size 765x29
- text run at (0,0) width 765: "This is a test for -apple-system. It should be the same as the line above."
</del><ins>+ RenderText {#text} at (0,0) size 767x29
+ text run at (0,0) width 767: "This is a test for -apple-system. It should be the same as the line above."
</ins><span class="cx"> RenderBlock {DIV} at (0,58) size 784x74
</span><del>- RenderText {#text} at (0,0) size 699x74
- text run at (0,0) width 699: "This is a test for -webkit-system-font, using the 'font'"
- text run at (0,37) width 113: "property"
</del><ins>+ RenderText {#text} at (0,0) size 704x74
+ text run at (0,0) width 704: "This is a test for -webkit-system-font, using the 'font'"
+ text run at (0,37) width 112: "property"
</ins><span class="cx"> RenderBlock {DIV} at (0,132) size 784x37
</span><del>- RenderText {#text} at (0,0) size 742x37
- text run at (0,0) width 742: "This is a test for -apple-system, using the 'font' property"
- RenderBlock {DIV} at (0,169) size 784x29
- RenderInline {B} at (0,0) size 551x29
- RenderText {#text} at (0,0) size 551x29
- text run at (0,0) width 551: "This is a test for -webkit-system-font in bold form"
- RenderBlock {DIV} at (0,198) size 784x29
- RenderInline {I} at (0,0) size 512x29
- RenderText {#text} at (0,0) size 512x29
- text run at (0,0) width 512: "This is a test for -webkit-system-font in italic form"
- RenderBlock {DIV} at (0,227) size 784x37
- RenderText {#text} at (0,0) size 655x37
- text run at (0,0) width 655: "This is a test for -webkit-system-font at size 30px"
- RenderBlock {DIV} at (0,264) size 784x44
- RenderText {#text} at (0,0) size 782x44
- text run at (0,0) width 782: "This is a test for -webkit-system-font at size 36px"
- RenderBlock {DIV} at (0,308) size 784x102
- RenderText {#text} at (0,0) size 721x102
- text run at (0,0) width 721: "This is a test for -webkit-system-font at"
- text run at (0,51) width 176: "size 42px"
- RenderBlock {DIV} at (0,410) size 784x116
- RenderText {#text} at (0,0) size 769x116
- text run at (0,0) width 769: "This is a test for -webkit-system-font"
- text run at (0,58) width 255: "at size 48px"
- RenderBlock {DIV} at (0,526) size 784x132
- RenderText {#text} at (0,0) size 769x132
- text run at (0,0) width 769: "This is a test for -webkit-system-"
- text run at (0,66) width 390: "font at size 54px"
- RenderBlock {DIV} at (0,658) size 784x146
- RenderText {#text} at (0,0) size 642x146
- text run at (0,0) width 642: "This is a test for -webkit-"
- text run at (0,73) width 642: "system-font at size 60px"
- RenderBlock {DIV} at (0,804) size 784x158
- RenderText {#text} at (0,0) size 704x158
- text run at (0,0) width 704: "This is a test for -webkit-"
- text run at (0,79) width 703: "system-font at size 66px"
- RenderBlock {DIV} at (0,962) size 784x174
- RenderText {#text} at (0,0) size 766x174
- text run at (0,0) width 766: "This is a test for -webkit-"
- text run at (0,87) width 759: "system-font at size 72px"
</del><ins>+ RenderText {#text} at (0,0) size 744x37
+ text run at (0,0) width 744: "This is a test for -apple-system, using the 'font' property"
+ RenderBlock {DIV} at (0,169) size 784x37
+ RenderText {#text} at (0,0) size 681x37
+ text run at (0,0) width 681: "This is a test for system-ui, using the 'font' property"
+ RenderBlock {DIV} at (0,206) size 784x29
+ RenderInline {B} at (0,0) size 569x29
+ RenderText {#text} at (0,0) size 569x29
+ text run at (0,0) width 569: "This is a test for -webkit-system-font in bold form"
+ RenderBlock {DIV} at (0,235) size 784x29
+ RenderInline {I} at (0,0) size 530x29
+ RenderText {#text} at (0,0) size 530x29
+ text run at (0,0) width 530: "This is a test for -webkit-system-font in italic form"
+ RenderBlock {DIV} at (0,264) size 784x37
+ RenderText {#text} at (0,0) size 662x37
+ text run at (0,0) width 662: "This is a test for -webkit-system-font at size 30px"
+ RenderBlock {DIV} at (0,301) size 784x88
+ RenderText {#text} at (0,0) size 700x88
+ text run at (0,0) width 700: "This is a test for -webkit-system-font at size"
+ text run at (0,44) width 82: "36px"
+ RenderBlock {DIV} at (0,389) size 784x102
+ RenderText {#text} at (0,0) size 731x102
+ text run at (0,0) width 731: "This is a test for -webkit-system-font at"
+ text run at (0,51) width 178: "size 42px"
+ RenderBlock {DIV} at (0,491) size 784x116
+ RenderText {#text} at (0,0) size 780x116
+ text run at (0,0) width 780: "This is a test for -webkit-system-font"
+ text run at (0,58) width 256: "at size 48px"
+ RenderBlock {DIV} at (0,607) size 784x132
+ RenderText {#text} at (0,0) size 781x132
+ text run at (0,0) width 781: "This is a test for -webkit-system-"
+ text run at (0,66) width 391: "font at size 54px"
+ RenderBlock {DIV} at (0,739) size 784x146
+ RenderText {#text} at (0,0) size 650x146
+ text run at (0,0) width 650: "This is a test for -webkit-"
+ text run at (0,73) width 649: "system-font at size 60px"
+ RenderBlock {DIV} at (0,885) size 784x158
+ RenderText {#text} at (0,0) size 713x158
+ text run at (0,0) width 713: "This is a test for -webkit-"
+ text run at (0,79) width 711: "system-font at size 66px"
+ RenderBlock {DIV} at (0,1043) size 784x174
+ RenderText {#text} at (0,0) size 776x174
+ text run at (0,0) width 776: "This is a test for -webkit-"
+ text run at (0,87) width 767: "system-font at size 72px"
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriosfasttextopticalFonthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <div style="font-family: -apple-system; font-size: 24px">This is a test for -apple-system. It should be the same as the line above.</div>
</span><span class="cx"> <div style="font: 30.0px -webkit-system-font">This is a test for -webkit-system-font, using the 'font' property</div>
</span><span class="cx"> <div style="font: 30px -apple-system">This is a test for -apple-system, using the 'font' property</div>
</span><ins>+ <div style="font: 30px system-ui">This is a test for system-ui, using the 'font' property</div>
</ins><span class="cx"> <div style="font-family: -webkit-system-font; font-size: 24px"><b>This is a test for -webkit-system-font in bold form</b></div>
</span><span class="cx"> <div style="font-family: -webkit-system-font; font-size: 24px"><i>This is a test for -webkit-system-font in italic form</i></div>
</span><span class="cx"> <div style="font-family: -webkit-system-font; font-size: 30px">This is a test for -webkit-system-font at size 30px</div>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriosfasttextopticalFontWithTextStyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithTextStyle-expected.txt (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithTextStyle-expected.txt 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithTextStyle-expected.txt 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -4,47 +4,47 @@
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,15) size 784x577
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 784x24
</span><del>- RenderText {#text} at (0,1) size 107x22
- text run at (0,1) width 107: "H1 / Headline"
</del><ins>+ RenderText {#text} at (0,1) size 106x22
+ text run at (0,1) width 106: "H1 / Headline"
</ins><span class="cx"> RenderBlock {DIV} at (0,39) size 784x35
</span><del>- RenderText {#text} at (0,0) size 122x34
- text run at (0,0) width 122: "T1 / Title1"
</del><ins>+ RenderText {#text} at (0,0) size 113x34
+ text run at (0,0) width 113: "T1 / Title1"
</ins><span class="cx"> RenderBlock {DIV} at (0,89) size 784x29
</span><del>- RenderText {#text} at (0,1) size 98x27
- text run at (0,1) width 98: "T2 / Title2"
</del><ins>+ RenderText {#text} at (0,1) size 99x27
+ text run at (0,1) width 99: "T2 / Title2"
</ins><span class="cx"> RenderBlock {DIV} at (0,133) size 784x26
</span><del>- RenderText {#text} at (0,0) size 89x25
- text run at (0,0) width 89: "T3 / Title3"
</del><ins>+ RenderText {#text} at (0,0) size 92x25
+ text run at (0,0) width 92: "T3 / Title3"
</ins><span class="cx"> RenderBlock {DIV} at (0,174) size 784x24
</span><del>- RenderText {#text} at (0,1) size 705x22
- text run at (0,1) width 705: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</del><ins>+ RenderText {#text} at (0,1) size 707x22
+ text run at (0,1) width 707: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</ins><span class="cx"> RenderBlock {DIV} at (0,213) size 784x26
</span><del>- RenderText {#text} at (0,2) size 735x22
- text run at (0,2) width 735: "Tall Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</del><ins>+ RenderText {#text} at (0,2) size 737x22
+ text run at (0,2) width 737: "Tall Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</ins><span class="cx"> RenderBlock {DIV} at (0,254) size 784x22
</span><del>- RenderText {#text} at (0,1) size 87x19
- text run at (0,1) width 87: "Subheadline"
</del><ins>+ RenderText {#text} at (0,1) size 85x19
+ text run at (0,1) width 85: "Subheadline"
</ins><span class="cx"> RenderBlock {DIV} at (0,291) size 784x20
</span><del>- RenderText {#text} at (0,1) size 81x17
- text run at (0,1) width 81: "FN / Footnote"
</del><ins>+ RenderText {#text} at (0,1) size 83x17
+ text run at (0,1) width 83: "FN / Footnote"
</ins><span class="cx"> RenderBlock {DIV} at (0,326) size 784x17
</span><span class="cx"> RenderText {#text} at (0,1) size 96x15
</span><span class="cx"> text run at (0,1) width 96: "Cap 1 / Caption 1"
</span><span class="cx"> RenderBlock {DIV} at (0,358) size 784x14
</span><del>- RenderText {#text} at (0,0) size 88x14
- text run at (0,0) width 88: "Cap 2 / Caption 2"
</del><ins>+ RenderText {#text} at (0,0) size 92x14
+ text run at (0,0) width 92: "Cap 2 / Caption 2"
</ins><span class="cx"> RenderBlock {DIV} at (0,387) size 784x22
</span><span class="cx"> RenderText {#text} at (0,0) size 154x22
</span><span class="cx"> text run at (0,0) width 154: "Short H1 / Headline"
</span><span class="cx"> RenderBlock {DIV} at (0,424) size 784x22
</span><del>- RenderText {#text} at (0,0) size 751x22
- text run at (0,0) width 751: "Short Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</del><ins>+ RenderText {#text} at (0,0) size 753x22
+ text run at (0,0) width 753: "Short Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</ins><span class="cx"> RenderBlock {DIV} at (0,461) size 784x20
</span><del>- RenderText {#text} at (0,0) size 128x19
- text run at (0,0) width 128: "Short Subheadline"
</del><ins>+ RenderText {#text} at (0,0) size 127x19
+ text run at (0,0) width 127: "Short Subheadline"
</ins><span class="cx"> RenderBlock {DIV} at (0,496) size 784x18
</span><del>- RenderText {#text} at (0,0) size 116x17
- text run at (0,0) width 116: "Short FN / Footnote"
</del><ins>+ RenderText {#text} at (0,0) size 120x17
+ text run at (0,0) width 120: "Short FN / Footnote"
</ins><span class="cx"> RenderBlock {DIV} at (0,529) size 784x15
</span><del>- RenderText {#text} at (0,0) size 128x15
- text run at (0,0) width 128: "Short Cap 1 / Caption 1"
</del><ins>+ RenderText {#text} at (0,0) size 130x15
+ text run at (0,0) width 130: "Short Cap 1 / Caption 1"
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriosfasttextopticalFontWithWeightexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1,71 +1,71 @@
</span><del>-layer at (0,0) size 800x822
</del><ins>+layer at (0,0) size 800x844
</ins><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x822
- RenderBlock {HTML} at (0,0) size 800x822
- RenderBody {BODY} at (8,8) size 784x798
- RenderBlock {H2} at (0,0) size 784x22
- RenderText {#text} at (0,1) size 113x20
- text run at (0,1) width 113: "Normal Weight"
- RenderBlock {P} at (0,38) size 784x20
- RenderText {#text} at (0,0) size 671x20
- text run at (0,0) width 671: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,74) size 784x22
- RenderText {#text} at (0,1) size 86x20
- text run at (0,1) width 86: "100 Weight"
- RenderBlock {P} at (0,112) size 784x20
- RenderText {#text} at (0,0) size 662x20
- text run at (0,0) width 662: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,148) size 784x22
- RenderText {#text} at (0,1) size 88x20
- text run at (0,1) width 88: "200 Weight"
- RenderBlock {P} at (0,186) size 784x20
- RenderText {#text} at (0,0) size 662x20
- text run at (0,0) width 662: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,222) size 784x22
- RenderText {#text} at (0,1) size 89x20
- text run at (0,1) width 89: "300 Weight"
- RenderBlock {P} at (0,260) size 784x20
- RenderText {#text} at (0,0) size 662x20
- text run at (0,0) width 662: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,296) size 784x22
- RenderText {#text} at (0,1) size 89x20
- text run at (0,1) width 89: "400 Weight"
- RenderBlock {P} at (0,334) size 784x20
- RenderText {#text} at (0,0) size 671x20
- text run at (0,0) width 671: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,370) size 784x22
- RenderText {#text} at (0,1) size 89x20
- text run at (0,1) width 89: "500 Weight"
- RenderBlock {P} at (0,408) size 784x20
- RenderText {#text} at (0,0) size 671x20
- text run at (0,0) width 671: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,444) size 784x22
- RenderText {#text} at (0,1) size 92x20
- text run at (0,1) width 92: "Bold Weight"
- RenderBlock {P} at (0,482) size 784x20
- RenderText {#text} at (0,0) size 701x20
- text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,518) size 784x22
- RenderText {#text} at (0,1) size 89x20
- text run at (0,1) width 89: "600 Weight"
- RenderBlock {P} at (0,556) size 784x20
- RenderText {#text} at (0,0) size 701x20
- text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,592) size 784x22
- RenderText {#text} at (0,1) size 88x20
- text run at (0,1) width 88: "700 Weight"
- RenderBlock {P} at (0,630) size 784x20
- RenderText {#text} at (0,0) size 701x20
- text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,666) size 784x22
- RenderText {#text} at (0,1) size 89x20
- text run at (0,1) width 89: "800 Weight"
- RenderBlock {P} at (0,704) size 784x20
- RenderText {#text} at (0,0) size 701x20
- text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,740) size 784x22
- RenderText {#text} at (0,1) size 89x20
- text run at (0,1) width 89: "900 Weight"
- RenderBlock {P} at (0,778) size 784x20
- RenderText {#text} at (0,0) size 701x20
- text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</del><ins>+layer at (0,0) size 800x844
+ RenderBlock {HTML} at (0,0) size 800x844
+ RenderBody {BODY} at (8,8) size 784x820
+ RenderBlock {H2} at (0,0) size 784x24
+ RenderText {#text} at (0,1) size 119x22
+ text run at (0,1) width 119: "Normal Weight"
+ RenderBlock {P} at (0,40) size 784x20
+ RenderText {#text} at (0,0) size 670x20
+ text run at (0,0) width 670: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,76) size 784x24
+ RenderText {#text} at (0,1) size 91x22
+ text run at (0,1) width 91: "100 Weight"
+ RenderBlock {P} at (0,116) size 784x20
+ RenderText {#text} at (0,0) size 661x20
+ text run at (0,0) width 661: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,152) size 784x24
+ RenderText {#text} at (0,1) size 93x22
+ text run at (0,1) width 93: "200 Weight"
+ RenderBlock {P} at (0,192) size 784x20
+ RenderText {#text} at (0,0) size 661x20
+ text run at (0,0) width 661: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,228) size 784x24
+ RenderText {#text} at (0,1) size 93x22
+ text run at (0,1) width 93: "300 Weight"
+ RenderBlock {P} at (0,268) size 784x20
+ RenderText {#text} at (0,0) size 661x20
+ text run at (0,0) width 661: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,304) size 784x24
+ RenderText {#text} at (0,1) size 94x22
+ text run at (0,1) width 94: "400 Weight"
+ RenderBlock {P} at (0,344) size 784x20
+ RenderText {#text} at (0,0) size 670x20
+ text run at (0,0) width 670: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,380) size 784x24
+ RenderText {#text} at (0,1) size 93x22
+ text run at (0,1) width 93: "500 Weight"
+ RenderBlock {P} at (0,420) size 784x20
+ RenderText {#text} at (0,0) size 687x20
+ text run at (0,0) width 687: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,456) size 784x24
+ RenderText {#text} at (0,1) size 97x22
+ text run at (0,1) width 97: "Bold Weight"
+ RenderBlock {P} at (0,496) size 784x20
+ RenderText {#text} at (0,0) size 717x20
+ text run at (0,0) width 717: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,532) size 784x24
+ RenderText {#text} at (0,1) size 94x22
+ text run at (0,1) width 94: "600 Weight"
+ RenderBlock {P} at (0,572) size 784x20
+ RenderText {#text} at (0,0) size 700x20
+ text run at (0,0) width 700: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,608) size 784x24
+ RenderText {#text} at (0,1) size 92x22
+ text run at (0,1) width 92: "700 Weight"
+ RenderBlock {P} at (0,648) size 784x20
+ RenderText {#text} at (0,0) size 717x20
+ text run at (0,0) width 717: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,684) size 784x24
+ RenderText {#text} at (0,1) size 94x22
+ text run at (0,1) width 94: "800 Weight"
+ RenderBlock {P} at (0,724) size 784x20
+ RenderText {#text} at (0,0) size 741x20
+ text run at (0,0) width 741: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,760) size 784x24
+ RenderText {#text} at (0,1) size 94x22
+ text run at (0,1) width 94: "900 Weight"
+ RenderBlock {P} at (0,800) size 784x20
+ RenderText {#text} at (0,0) size 741x20
+ text run at (0,0) width 741: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriosfasttextopticalFontWithWeighthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> font: -apple-system-headline;
</span><span class="cx"> }
</span><span class="cx"> p {
</span><del>- font-family: -apple-system;
</del><ins>+ font-family: system-ui;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoriosfasttextunderlinescalinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling.html (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling.html 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling.html 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</span><span class="cx"> <style>
</span><span class="cx"> p {
</span><del>- font-family: -apple-system;
</del><ins>+ font-family: system-ui;
</ins><span class="cx"> text-decoration: underline;
</span><span class="cx"> margin-top: 0;
</span><span class="cx"> margin-bottom: 0;
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsscss2systemfontsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> This tests platform specific system font styles. If any of the styles appear in monospace the test fails.
</span><del>-caption: normal normal normal 13px/16px -apple-system
-icon: normal normal normal 13px/16px -apple-system
</del><ins>+caption: normal normal normal 13px/16px system-ui
+icon: normal normal normal 13px/16px system-ui
</ins><span class="cx"> menu: normal normal normal 13px/16px -apple-menu
</span><del>-message-box: normal normal normal 13px/16px -apple-system
-small-caption: normal normal normal 11px/13px -apple-system
</del><ins>+message-box: normal normal normal 13px/16px system-ui
+small-caption: normal normal normal 11px/13px system-ui
</ins><span class="cx"> status-bar: normal normal normal 10px/12px -apple-status-bar
</span><del>--webkit-mini-control: normal normal normal 9px/11px -apple-system
--webkit-small-control: normal normal normal 11px/13px -apple-system
--webkit-control: normal normal normal 13px/16px -apple-system
</del><ins>+-webkit-mini-control: normal normal normal 9px/11px system-ui
+-webkit-small-control: normal normal normal 11px/13px system-ui
+-webkit-control: normal normal normal 13px/16px system-ui
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/ChangeLog 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2017-02-24 Jon Lee <jonlee@apple.com>
+
+ Alias "system-ui" for the System font name
+ https://bugs.webkit.org/show_bug.cgi?id=151493
+
+ Reviewed by Tim Horton and Joseph Pecoraro.
+
+ Updated existing tests.
+
+ * WebCore.xcodeproj/project.pbxproj: Add WebKitFontFamilyNames.in for
+ convenience.
+ * css/CSSValueKeywords.in: Add system-ui as a keyword.
+ * css/WebKitFontFamilyNames.in: Add system-ui.
+
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::platformFontWithFamilySpecialCase): Include "system-ui" as an
+ alias.
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::platformFontWithFamilySpecialCase): Ditto.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::updateCachedSystemFontDescription): Update
+ serialization to "system-ui" from "-apple-system".
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::identifierForFamily):
+ * css/CSSFontFaceSet.cpp:
+ (WebCore::CSSFontFaceSet::familyNameFromPrimitive):
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyValueFontFamily):
+
</ins><span class="cx"> 2017-02-24 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media: notify clients when autoplay is denied
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -8587,6 +8587,7 @@
</span><span class="cx"> 2EF1BFE9121C9F4200C27627 /* FileStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileStream.h; sourceTree = "<group>"; };
</span><span class="cx"> 2EF1BFF8121CB0CE00C27627 /* FileStreamClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileStreamClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 3103B7DE1DB01556008BB890 /* ColorHash.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ColorHash.h; sourceTree = "<group>"; };
</span><ins>+ 31055BB81E4FE18900EB604E /* WebKitFontFamilyNames.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitFontFamilyNames.in; sourceTree = "<group>"; };
</ins><span class="cx"> 31078CC21880A6A6008099DC /* OESTextureHalfFloatLinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OESTextureHalfFloatLinear.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 31078CC31880A6A6008099DC /* OESTextureHalfFloatLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OESTextureHalfFloatLinear.h; sourceTree = "<group>"; };
</span><span class="cx"> 31078CC41880A6A6008099DC /* OESTextureHalfFloatLinear.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OESTextureHalfFloatLinear.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -24075,6 +24076,7 @@
</span><span class="cx"> 3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */,
</span><span class="cx"> 3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */,
</span><span class="cx"> 3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */,
</span><ins>+ 31055BB81E4FE18900EB604E /* WebKitFontFamilyNames.in */,
</ins><span class="cx"> );
</span><span class="cx"> path = css;
</span><span class="cx"> sourceTree = "<group>";
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1677,6 +1677,8 @@
</span><span class="cx"> return CSSValueSansSerif;
</span><span class="cx"> if (family == serifFamily)
</span><span class="cx"> return CSSValueSerif;
</span><ins>+ if (family == systemUiFamily)
+ return CSSValueSystemUi;
</ins><span class="cx"> return CSSValueInvalid;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSet.cpp (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -142,6 +142,8 @@
</span><span class="cx"> return monospaceFamily;
</span><span class="cx"> case CSSValueWebkitPictograph:
</span><span class="cx"> return pictographFamily;
</span><ins>+ case CSSValueSystemUi:
+ return systemUiFamily;
</ins><span class="cx"> default:
</span><span class="cx"> return { };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -173,6 +173,7 @@
</span><span class="cx"> monospace
</span><span class="cx"> -webkit-body
</span><span class="cx"> -webkit-pictograph
</span><ins>+system-ui
</ins><span class="cx"> //
</span><span class="cx"> //
</span><span class="cx"> // CSS_PROP_*_COLOR
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -902,6 +902,10 @@
</span><span class="cx"> family = pictographFamily;
</span><span class="cx"> isGenericFamily = true;
</span><span class="cx"> break;
</span><ins>+ case CSSValueSystemUi:
+ family = systemUiFamily;
+ isGenericFamily = true;
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitFontFamilyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitFontFamilyNames.in (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitFontFamilyNames.in 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/css/WebKitFontFamilyNames.in 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -5,3 +5,4 @@
</span><span class="cx"> serifFamily="-webkit-serif"
</span><span class="cx"> pictographFamily="-webkit-pictograph"
</span><span class="cx"> standardFamily="-webkit-standard"
</span><ins>+systemUiFamily="-webkit-system-ui"
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> return adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), size, nullptr));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (equalLettersIgnoringASCIICase(family, "-webkit-system-font") || equalLettersIgnoringASCIICase(family, "-apple-system") || equalLettersIgnoringASCIICase(family, "-apple-system-font")) {
</del><ins>+ if (equalLettersIgnoringASCIICase(family, "-webkit-system-font") || equalLettersIgnoringASCIICase(family, "-apple-system") || equalLettersIgnoringASCIICase(family, "-apple-system-font") || equalLettersIgnoringASCIICase(family, "system-ui")) {
</ins><span class="cx"> return adoptCF(CTFontCreateWithFontDescriptor(systemFontDescriptor(weight, traits & kCTFontTraitBold, traits & kCTFontTraitItalic, size).get(), size, nullptr));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontWeight weight, CTFontSymbolicTraits desiredTraits, float size)
</span><span class="cx"> {
</span><del>- if (equalLettersIgnoringASCIICase(family, "-webkit-system-font") || equalLettersIgnoringASCIICase(family, "-apple-system") || equalLettersIgnoringASCIICase(family, "-apple-system-font")) {
</del><ins>+ if (equalLettersIgnoringASCIICase(family, "-webkit-system-font") || equalLettersIgnoringASCIICase(family, "-apple-system") || equalLettersIgnoringASCIICase(family, "-apple-system-font") || equalLettersIgnoringASCIICase(family, "system-ui")) {
</ins><span class="cx"> RetainPtr<CTFontRef> result = toCTFont([NSFont systemFontOfSize:size weight:toNSFontWeight(weight)]);
</span><span class="cx"> if (desiredTraits & kCTFontItalicTrait) {
</span><span class="cx"> if (auto italicizedFont = adoptCF(CTFontCreateCopyWithSymbolicTraits(result.get(), size, nullptr, desiredTraits, desiredTraits)))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (fontName.isNull())
</span><del>- fontName = AtomicString("-apple-system", AtomicString::ConstructFromLiteral);
</del><ins>+ fontName = AtomicString("system-ui", AtomicString::ConstructFromLiteral);
</ins><span class="cx">
</span><span class="cx"> NSFontManager *fontManager = [NSFontManager sharedFontManager];
</span><span class="cx"> fontDescription.setIsAbsoluteSize(true);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-02-24 Jon Lee <jonlee@apple.com>
+
+ Alias "system-ui" for the System font name
+ https://bugs.webkit.org/show_bug.cgi?id=151493
+
+ Reviewed by Tim Horton and Joseph Pecoraro.
+
+ * UserInterface/Models/CSSKeywordCompletions.js: Ditto.
+
</ins><span class="cx"> 2017-02-23 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: RTL: DOM Tree spacing is wrong
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (212984 => 212985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2017-02-25 02:07:05 UTC (rev 212984)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2017-02-25 02:07:12 UTC (rev 212985)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> "-apple-system-headline", "-apple-system-body", "-apple-system-subheadline", "-apple-system-footnote",
</span><span class="cx"> "-apple-system-caption1", "-apple-system-caption2", "-apple-system-short-headline", "-apple-system-short-body",
</span><span class="cx"> "-apple-system-short-subheadline", "-apple-system-short-footnote", "-apple-system-short-caption1",
</span><del>- "-apple-system-tall-body", "-apple-system-title1", "-apple-system-title2", "-apple-system-title3"
</del><ins>+ "-apple-system-tall-body", "-apple-system-title1", "-apple-system-title2", "-apple-system-title3", "system-ui"
</ins><span class="cx"> ],
</span><span class="cx"> "dominant-baseline": [
</span><span class="cx"> "middle", "auto", "central", "text-before-edge", "text-after-edge", "ideographic", "alphabetic", "hanging",
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> "-apple-system-subheadline", "-apple-system-footnote", "-apple-system-caption1", "-apple-system-caption2",
</span><span class="cx"> "-apple-system-short-headline", "-apple-system-short-body", "-apple-system-short-subheadline",
</span><span class="cx"> "-apple-system-short-footnote", "-apple-system-short-caption1", "-apple-system-tall-body",
</span><del>- "-apple-system-title1", "-apple-system-title2", "-apple-system-title3"
</del><ins>+ "-apple-system-title1", "-apple-system-title2", "-apple-system-title3", "system-ui"
</ins><span class="cx"> ],
</span><span class="cx"> "text-overflow-mode": [
</span><span class="cx"> "clip", "ellipsis"
</span></span></pre>
</div>
</div>
</body>
</html>