<!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>[243605] 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/243605">243605</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2019-03-28 09:02:24 -0700 (Thu, 28 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[SimpleLineLayout] Disable SLL when text-underline-position is not auto.
https://bugs.webkit.org/show_bug.cgi?id=196338
<rdar://problem/47975167>

Reviewed by Daniel Bates.

Source/WebCore:

Disable simple line layout unconditionally on non-auto text-underline-position content. We don't support it yet.

Test: fast/text/simple-line-layout-with-text-underline-position.html

* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForStyle):

LayoutTests:

* fast/text/simple-line-layout-with-text-underline-position-expected.html: Added.
* fast/text/simple-line-layout-with-text-underline-position.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutwithtextunderlinepositionexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutwithtextunderlinepositionhtml">trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (243604 => 243605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-28 15:54:20 UTC (rev 243604)
+++ trunk/LayoutTests/ChangeLog 2019-03-28 16:02:24 UTC (rev 243605)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-03-28  Zalan Bujtas  <zalan@apple.com>
+
+        [SimpleLineLayout] Disable SLL when text-underline-position is not auto.
+        https://bugs.webkit.org/show_bug.cgi?id=196338
+        <rdar://problem/47975167>
+
+        Reviewed by Daniel Bates.
+
+        * fast/text/simple-line-layout-with-text-underline-position-expected.html: Added.
+        * fast/text/simple-line-layout-with-text-underline-position.html: Added.
+
</ins><span class="cx"> 2019-03-28  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [FreeType] Incorrect application of glyph positioning in the Y direction
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutwithtextunderlinepositionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html (0 => 243605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html   2019-03-28 16:02:24 UTC (rev 243605)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple line layout is disabled for text-underline-position: under</title>
+</head>
+<body></body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutwithtextunderlinepositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html (0 => 243605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html                         (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html    2019-03-28 16:02:24 UTC (rev 243605)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple line layout is disabled for text-underline-position: under</title>
+<style>
+div {
+    color: white;      
+}
+
+.first {
+    overflow: hidden;
+}
+.second, .first {
+       text-underline-position: under;
+}
+</style>
+<script>
+if (window.internals) {
+    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
+    internals.settings.setSimpleLineLayoutEnabled(true);
+}
+</script>
+</head>
+<body>
+<div class=first>Pass if after selecting these 2 lines</div>
+<div class=second>this line is still visible</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (243604 => 243605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-28 15:54:20 UTC (rev 243604)
+++ trunk/Source/WebCore/ChangeLog      2019-03-28 16:02:24 UTC (rev 243605)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2019-03-28  Zalan Bujtas  <zalan@apple.com>
+
+        [SimpleLineLayout] Disable SLL when text-underline-position is not auto.
+        https://bugs.webkit.org/show_bug.cgi?id=196338
+        <rdar://problem/47975167>
+
+        Reviewed by Daniel Bates.
+
+        Disable simple line layout unconditionally on non-auto text-underline-position content. We don't support it yet.
+
+        Test: fast/text/simple-line-layout-with-text-underline-position.html
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseForStyle):
+
</ins><span class="cx"> 2019-03-28  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Silence lot of warnings when compiling with clang
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (243604 => 243605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp      2019-03-28 15:54:20 UTC (rev 243604)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2019-03-28 16:02:24 UTC (rev 243605)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">     AvoidanceReasonFlags reasons = { };
</span><span class="cx">     if (style.textOverflow() == TextOverflow::Ellipsis)
</span><span class="cx">         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasTextOverflow, reasons, includeReasons);
</span><del>-    if ((style.textDecorationsInEffect() & TextDecoration::Underline) && (style.textUnderlinePosition() != TextUnderlinePosition::Auto || !style.textUnderlineOffset().isAuto() || !style.textDecorationThickness().isAuto()))
</del><ins>+    if (style.textUnderlinePosition() != TextUnderlinePosition::Auto || !style.textUnderlineOffset().isAuto() || !style.textDecorationThickness().isAuto())
</ins><span class="cx">         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasUnsupportedUnderlineDecoration, reasons, includeReasons);
</span><span class="cx">     // Non-visible overflow should be pretty easy to support.
</span><span class="cx">     if (style.overflowX() != Overflow::Visible || style.overflowY() != Overflow::Visible)
</span></span></pre>
</div>
</div>

</body>
</html>