<!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>[246481] trunk/Source/WebCore</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/246481">246481</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2019-06-16 13:04:31 -0700 (Sun, 16 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Ignore descent when in limited/full quirks mode
https://bugs.webkit.org/show_bug.cgi?id=198893
<rdar://problem/51780634>

Reviewed by Antti Koivisto.

In limited/full quirks mode, line's descent should be ignored when computing the final line height when
1. the line has baseline aligned content only and
2. these baseline aligned boxes don't have descent.

* layout/inlineformatting/InlineLine.cpp:
(WebCore::Layout::Line::isVisuallyEmpty const):
(WebCore::Layout::Line::close):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineLinecpp">trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (246480 => 246481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-06-16 20:02:17 UTC (rev 246480)
+++ trunk/Source/WebCore/ChangeLog      2019-06-16 20:04:31 UTC (rev 246481)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2019-06-16  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [LFC][IFC] Ignore descent when in limited/full quirks mode
+        https://bugs.webkit.org/show_bug.cgi?id=198893
+        <rdar://problem/51780634>
+
+        Reviewed by Antti Koivisto.
+
+        In limited/full quirks mode, line's descent should be ignored when computing the final line height when
+        1. the line has baseline aligned content only and
+        2. these baseline aligned boxes don't have descent.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::isVisuallyEmpty const):
+        (WebCore::Layout::Line::close):
+
+2019-06-16  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC][IFC] Line::isVisuallyEmpty should check inline-block boxes.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=198894
</span><span class="cx">         <rdar://problem/51780886>
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp (246480 => 246481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp      2019-06-16 20:02:17 UTC (rev 246480)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp 2019-06-16 20:04:31 UTC (rev 246481)
</span><span class="lines">@@ -100,19 +100,24 @@
</span><span class="cx">             m_contentLogicalHeight = { };
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        auto hasDescent = false;
+        auto hasNonBaselineAlignedContent = false;
</ins><span class="cx">         for (auto& run : m_content->runs()) {
</span><span class="cx">             LayoutUnit logicalTop;
</span><span class="cx">             auto& inlineItem = run->inlineItem;
</span><span class="cx">             auto& layoutBox = inlineItem.layoutBox();
</span><ins>+            auto verticalAlign = inlineItem.style().verticalAlign();
</ins><span class="cx">             auto ascent = inlineItem.style().fontMetrics().ascent();
</span><span class="cx"> 
</span><del>-            switch (inlineItem.style().verticalAlign()) {
</del><ins>+            switch (verticalAlign) {
</ins><span class="cx">             case VerticalAlign::Baseline:
</span><del>-                if (inlineItem.isLineBreak() || inlineItem.isText())
</del><ins>+                if (inlineItem.isLineBreak() || inlineItem.isText()) {
</ins><span class="cx">                     logicalTop = baselineOffset() - ascent;
</span><del>-                else if (inlineItem.isContainerStart()) {
</del><ins>+                    hasDescent = hasDescent || !run->isCollapsed;
+                } else if (inlineItem.isContainerStart()) {
</ins><span class="cx">                     auto& displayBox = m_layoutState.displayBoxForLayoutBox(layoutBox);
</span><span class="cx">                     logicalTop = baselineOffset() - ascent - displayBox.borderTop() - displayBox.paddingTop().valueOr(0);
</span><ins>+                    hasDescent = hasDescent || (displayBox.horizontalBorder() || (displayBox.horizontalPadding() && displayBox.horizontalPadding().value()));
</ins><span class="cx">                 } else if (layoutBox.isInlineBlockBox() && layoutBox.establishesInlineFormattingContext()) {
</span><span class="cx">                     auto& formattingState = downcast<InlineFormattingState>(m_layoutState.establishedFormattingState(layoutBox));
</span><span class="cx">                     // Spec makes us generate at least one line -even if it is empty.
</span><span class="lines">@@ -119,6 +124,7 @@
</span><span class="cx">                     ASSERT(!formattingState.lineBoxes().isEmpty());
</span><span class="cx">                     auto inlineBlockBaseline = formattingState.lineBoxes().last().baseline();
</span><span class="cx">                     logicalTop = baselineOffset() - inlineBlockBaseline.ascent;
</span><ins>+                    hasDescent = hasDescent || inlineBlockBaseline.descent;
</ins><span class="cx">                 } else
</span><span class="cx">                     logicalTop = baselineOffset() - run->logicalRect.height();
</span><span class="cx">                 break;
</span><span class="lines">@@ -132,8 +138,14 @@
</span><span class="cx">                 ASSERT_NOT_IMPLEMENTED_YET();
</span><span class="cx">                 break;
</span><span class="cx">             }
</span><ins>+            hasNonBaselineAlignedContent = hasNonBaselineAlignedContent || verticalAlign != VerticalAlign::Baseline;
</ins><span class="cx">             run->logicalRect.setTop(logicalTop);
</span><span class="cx">         }
</span><ins>+        // Remove descent when all content is baseline aligned but none of them have descent.
+        if (!m_layoutState.inNoQuirksMode() && !hasNonBaselineAlignedContent && !hasDescent) {
+            m_contentLogicalHeight -= m_baseline.descent;
+            m_baseline.descent = { };
+        }
</ins><span class="cx">     }
</span><span class="cx">     m_content->setLogicalRect({ logicalTop(), logicalLeft(), contentLogicalWidth(), logicalHeight() });
</span><span class="cx">     m_content->setBaseline(m_baseline);
</span></span></pre>
</div>
</div>

</body>
</html>