<!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>[214730] 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/214730">214730</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2017-04-02 20:13:42 -0700 (Sun, 02 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build fix for
Add missing text styles
https://bugs.webkit.org/show_bug.cgi?id=170295
Source/WebCore:
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::cachedSystemFontDescription):
(WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
LayoutTests:
* platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiosiosfasttextopticalFontWithTextStyleexpectedtxt">trunk/LayoutTests/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214729 => 214730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-03 02:50:59 UTC (rev 214729)
+++ trunk/LayoutTests/ChangeLog 2017-04-03 03:13:42 UTC (rev 214730)
</span><span class="lines">@@ -1,5 +1,13 @@
</span><span class="cx"> 2017-04-02 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ Build fix for
+ Add missing text styles
+ https://bugs.webkit.org/show_bug.cgi?id=170295
+
+ * platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt:
+
+2017-04-02 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> Fix lint errors.
</span><span class="cx">
</span><span class="cx"> * TestExpectations:
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiosiosfasttextopticalFontWithTextStyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt (214729 => 214730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt 2017-04-03 02:50:59 UTC (rev 214729)
+++ trunk/LayoutTests/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt 2017-04-03 03:13:42 UTC (rev 214730)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-layer at (0,0) size 800x663
</del><ins>+layer at (0,0) size 800x629
</ins><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x663
- RenderBlock {HTML} at (0,0) size 800x663
- RenderBody {BODY} at (8,15) size 784x640
</del><ins>+layer at (0,0) size 800x629
+ RenderBlock {HTML} at (0,0) size 800x629
+ RenderBody {BODY} at (8,15) size 784x606
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 784x24
</span><span class="cx"> RenderText {#text} at (0,1) size 106x22
</span><span class="cx"> text run at (0,1) width 106: "H1 / Headline"
</span><span class="lines">@@ -18,39 +18,39 @@
</span><span class="cx"> RenderBlock {DIV} at (0,164) size 784x26
</span><span class="cx"> RenderText {#text} at (0,0) size 92x25
</span><span class="cx"> text run at (0,0) width 92: "T3 / Title3"
</span><del>- RenderBlock {DIV} at (0,205) size 784x50
- RenderText {#text} at (0,1) size 187x47
- text run at (0,1) width 187: "T4 / Title4"
- RenderBlock {DIV} at (0,270) size 784x24
</del><ins>+ RenderBlock {DIV} at (0,205) size 784x16
+ RenderText {#text} at (0,0) size 56x15
+ text run at (0,0) width 56: "T4 / Title4"
+ RenderBlock {DIV} at (0,236) size 784x24
</ins><span class="cx"> RenderText {#text} at (0,1) size 707x22
</span><span class="cx"> text run at (0,1) width 707: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</span><del>- RenderBlock {DIV} at (0,309) size 784x26
</del><ins>+ RenderBlock {DIV} at (0,275) size 784x26
</ins><span class="cx"> RenderText {#text} at (0,2) size 737x22
</span><span class="cx"> text run at (0,2) width 737: "Tall Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</span><del>- RenderBlock {DIV} at (0,350) size 784x22
</del><ins>+ RenderBlock {DIV} at (0,316) size 784x22
</ins><span class="cx"> RenderText {#text} at (0,1) size 85x19
</span><span class="cx"> text run at (0,1) width 85: "Subheadline"
</span><del>- RenderBlock {DIV} at (0,387) size 784x20
</del><ins>+ RenderBlock {DIV} at (0,353) size 784x20
</ins><span class="cx"> RenderText {#text} at (0,1) size 83x17
</span><span class="cx"> text run at (0,1) width 83: "FN / Footnote"
</span><del>- RenderBlock {DIV} at (0,422) size 784x17
</del><ins>+ RenderBlock {DIV} at (0,388) size 784x17
</ins><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><del>- RenderBlock {DIV} at (0,454) size 784x14
</del><ins>+ RenderBlock {DIV} at (0,420) size 784x14
</ins><span class="cx"> RenderText {#text} at (0,0) size 92x14
</span><span class="cx"> text run at (0,0) width 92: "Cap 2 / Caption 2"
</span><del>- RenderBlock {DIV} at (0,483) size 784x22
</del><ins>+ RenderBlock {DIV} at (0,449) size 784x22
</ins><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><del>- RenderBlock {DIV} at (0,520) size 784x22
</del><ins>+ RenderBlock {DIV} at (0,486) size 784x22
</ins><span class="cx"> RenderText {#text} at (0,0) size 753x22
</span><span class="cx"> text run at (0,0) width 753: "Short Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
</span><del>- RenderBlock {DIV} at (0,557) size 784x20
</del><ins>+ RenderBlock {DIV} at (0,523) size 784x20
</ins><span class="cx"> RenderText {#text} at (0,0) size 127x19
</span><span class="cx"> text run at (0,0) width 127: "Short Subheadline"
</span><del>- RenderBlock {DIV} at (0,592) size 784x18
</del><ins>+ RenderBlock {DIV} at (0,558) size 784x18
</ins><span class="cx"> RenderText {#text} at (0,0) size 120x17
</span><span class="cx"> text run at (0,0) width 120: "Short FN / Footnote"
</span><del>- RenderBlock {DIV} at (0,625) size 784x15
</del><ins>+ RenderBlock {DIV} at (0,591) size 784x15
</ins><span class="cx"> RenderText {#text} at (0,0) size 130x15
</span><span class="cx"> text run at (0,0) width 130: "Short Cap 1 / Caption 1"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214729 => 214730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-03 02:50:59 UTC (rev 214729)
+++ trunk/Source/WebCore/ChangeLog 2017-04-03 03:13:42 UTC (rev 214730)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-04-02 Alexey Proskuryakov <ap@apple.com>
+
+ Build fix for
+ Add missing text styles
+ https://bugs.webkit.org/show_bug.cgi?id=170295
+
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::cachedSystemFontDescription):
+ (WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
+
</ins><span class="cx"> 2017-04-01 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Long Arabic text in ContentEditable with css white-space=pre hangs Safari
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (214729 => 214730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2017-04-03 02:50:59 UTC (rev 214729)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2017-04-03 03:13:42 UTC (rev 214730)
</span><span class="lines">@@ -1141,7 +1141,7 @@
</span><span class="cx"> static NeverDestroyed<FontCascadeDescription> title1Font;
</span><span class="cx"> static NeverDestroyed<FontCascadeDescription> title2Font;
</span><span class="cx"> static NeverDestroyed<FontCascadeDescription> title3Font;
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</del><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
</ins><span class="cx"> static NeverDestroyed<FontCascadeDescription> title4Font;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1179,7 +1179,7 @@
</span><span class="cx"> return title2Font;
</span><span class="cx"> case CSSValueAppleSystemTitle3:
</span><span class="cx"> return title3Font;
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</del><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
</ins><span class="cx"> case CSSValueAppleSystemTitle4:
</span><span class="cx"> return title4Font;
</span><span class="cx"> #endif
</span><span class="lines">@@ -1241,7 +1241,7 @@
</span><span class="cx"> textStyle = kCTUIFontTextStyleTitle3;
</span><span class="cx"> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
</span><span class="cx"> break;
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</del><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
</ins><span class="cx"> case CSSValueAppleSystemTitle4:
</span><span class="cx"> textStyle = kCTUIFontTextStyleTitle4;
</span><span class="cx"> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
</span></span></pre>
</div>
</div>
</body>
</html>