<!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>[246679] 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/246679">246679</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2019-06-21 08:43:17 -0700 (Fri, 21 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Rename Line::m_contentLogicalHeight to m_lineLogicalHeight
https://bugs.webkit.org/show_bug.cgi?id=199100
<rdar://problem/51973614>

Reviewed by Antti Koivisto.

m_logicalLineHeight name seems more appropriate at this point (though the line heigh is driven by the content height).

* layout/inlineformatting/InlineLine.cpp:
(WebCore::Layout::Line::close):
(WebCore::Layout::Line::adjustBaselineAndLineHeight):
* layout/inlineformatting/InlineLine.h:
(WebCore::Layout::Line::logicalHeight const):</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>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineLineh">trunk/Source/WebCore/layout/inlineformatting/InlineLine.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (246678 => 246679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-06-21 15:31:02 UTC (rev 246678)
+++ trunk/Source/WebCore/ChangeLog      2019-06-21 15:43:17 UTC (rev 246679)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2019-06-21  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [LFC][IFC] Rename Line::m_contentLogicalHeight to m_lineLogicalHeight
+        https://bugs.webkit.org/show_bug.cgi?id=199100
+        <rdar://problem/51973614>
+
+        Reviewed by Antti Koivisto.
+
+        m_logicalLineHeight name seems more appropriate at this point (though the line heigh is driven by the content height).
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::close):
+        (WebCore::Layout::Line::adjustBaselineAndLineHeight):
+        * layout/inlineformatting/InlineLine.h:
+        (WebCore::Layout::Line::logicalHeight const):
+
+2019-06-21  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC][IFC] LineBox::Baseline should have a height getter.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=199092
</span><span class="cx">         <rdar://problem/51966958>
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp (246678 => 246679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp      2019-06-21 15:31:02 UTC (rev 246678)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp 2019-06-21 15:43:17 UTC (rev 246679)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">     , m_logicalTopLeft(initialConstraints.topLeft)
</span><span class="cx">     , m_baseline({ initialConstraints.heightAndBaseline.baselineOffset, initialConstraints.heightAndBaseline.height - initialConstraints.heightAndBaseline.baselineOffset })
</span><span class="cx">     , m_initialStrut(initialConstraints.heightAndBaseline.strut)
</span><del>-    , m_contentLogicalHeight(initialConstraints.heightAndBaseline.height)
</del><ins>+    , m_lineLogicalHeight(initialConstraints.heightAndBaseline.height)
</ins><span class="cx">     , m_lineLogicalWidth(initialConstraints.availableWidth)
</span><span class="cx">     , m_skipVerticalAligment(skipVerticalAligment == SkipVerticalAligment::Yes)
</span><span class="cx"> {
</span><span class="lines">@@ -91,12 +91,12 @@
</span><span class="cx">         if (isVisuallyEmpty()) {
</span><span class="cx">             m_baseline = { };
</span><span class="cx">             m_baselineTop = { };
</span><del>-            m_contentLogicalHeight = { };
</del><ins>+            m_lineLogicalHeight = { };
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Remove descent when all content is baseline aligned but none of them have descent.
</span><span class="cx">         if (InlineFormattingContext::Quirks::lineDescentNeedsCollapsing(m_layoutState, *m_content)) {
</span><del>-            m_contentLogicalHeight -= m_baseline.descent;
</del><ins>+            m_lineLogicalHeight -= m_baseline.descent;
</ins><span class="cx">             m_baseline.descent = { };
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx">             m_baseline.descent = std::max(m_baseline.descent, halfLeading.descent);
</span><span class="cx">         if (halfLeading.ascent > 0)
</span><span class="cx">             m_baseline.ascent = std::max(m_baseline.ascent, halfLeading.ascent);
</span><del>-        m_contentLogicalHeight = std::max(m_contentLogicalHeight, m_baseline.height());
</del><ins>+        m_lineLogicalHeight = std::max(m_lineLogicalHeight, m_baseline.height());
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     // Apply initial strut if needed.
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx">             return;
</span><span class="cx">         m_baseline.ascent = std::max(m_initialStrut->ascent, m_baseline.ascent);
</span><span class="cx">         m_baseline.descent = std::max(m_initialStrut->descent, m_baseline.descent);
</span><del>-        m_contentLogicalHeight = std::max(m_contentLogicalHeight, m_baseline.height());
</del><ins>+        m_lineLogicalHeight = std::max(m_lineLogicalHeight, m_baseline.height());
</ins><span class="cx">         m_initialStrut = { };
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -343,21 +343,21 @@
</span><span class="cx">             auto inlineBlockBaseline = formattingState.lineBoxes().last().baseline();
</span><span class="cx">             m_baseline.descent = std::max(inlineBlockBaseline.descent, m_baseline.descent);
</span><span class="cx">             m_baseline.ascent = std::max(inlineBlockBaseline.ascent, m_baseline.ascent);
</span><del>-            m_contentLogicalHeight = std::max(std::max(m_contentLogicalHeight, runHeight), m_baseline.height());
</del><ins>+            m_lineLogicalHeight = std::max(std::max(m_lineLogicalHeight, runHeight), m_baseline.height());
</ins><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">         m_baseline.descent = std::max<LayoutUnit>(0, m_baseline.descent);
</span><span class="cx">         m_baseline.ascent = std::max(runHeight, m_baseline.ascent);
</span><del>-        m_contentLogicalHeight = std::max(m_contentLogicalHeight, m_baseline.height());
</del><ins>+        m_lineLogicalHeight = std::max(m_lineLogicalHeight, m_baseline.height());
</ins><span class="cx">         break;
</span><span class="cx">     case VerticalAlign::Top:
</span><span class="cx">         // Top align content never changes the baseline offset, it only pushes the bottom of the line further down.
</span><del>-        m_contentLogicalHeight = std::max(runHeight, m_contentLogicalHeight);
</del><ins>+        m_lineLogicalHeight = std::max(runHeight, m_lineLogicalHeight);
</ins><span class="cx">         break;
</span><span class="cx">     case VerticalAlign::Bottom:
</span><del>-        if (m_contentLogicalHeight < runHeight) {
-            m_baselineTop += runHeight - m_contentLogicalHeight;
-            m_contentLogicalHeight = runHeight;
</del><ins>+        if (m_lineLogicalHeight < runHeight) {
+            m_baselineTop += runHeight - m_lineLogicalHeight;
+            m_lineLogicalHeight = runHeight;
</ins><span class="cx">         }
</span><span class="cx">         break;
</span><span class="cx">     default:
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineLineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLine.h (246678 => 246679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineLine.h        2019-06-21 15:31:02 UTC (rev 246678)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLine.h   2019-06-21 15:43:17 UTC (rev 246679)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">     LayoutUnit logicalRight() const { return logicalLeft() + logicalWidth(); }
</span><span class="cx"> 
</span><span class="cx">     LayoutUnit logicalWidth() const { return m_lineLogicalWidth; }
</span><del>-    LayoutUnit logicalHeight() const { return m_contentLogicalHeight; }
</del><ins>+    LayoutUnit logicalHeight() const { return m_lineLogicalHeight; }
</ins><span class="cx"> 
</span><span class="cx">     LayoutUnit contentLogicalWidth() const { return m_contentLogicalWidth; }
</span><span class="cx">     LayoutUnit baselineOffset() const { return m_baseline.ascent + m_baselineTop; }
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">     LayoutUnit m_baselineTop;
</span><span class="cx"> 
</span><span class="cx">     Optional<LineBox::Baseline> m_initialStrut;
</span><del>-    LayoutUnit m_contentLogicalHeight;
</del><ins>+    LayoutUnit m_lineLogicalHeight;
</ins><span class="cx">     LayoutUnit m_lineLogicalWidth;
</span><span class="cx">     bool m_skipVerticalAligment { false };
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>