Changeset 246679 in webkit

Timestamp:

Jun 21, 2019 8:43:17 AM (5 years ago)

Author:

Alan Bujtas

Message:

[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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLine.cpp (modified) (5 diffs)
• layout/inlineformatting/InlineLine.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-21  Zalan Bujtas  <zalan@apple.com>
+
+        [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>
 

trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp

@@ -51 +51 @@
     , m_baseline({ initialConstraints.heightAndBaseline.baselineOffset, initialConstraints.heightAndBaseline.height - initialConstraints.heightAndBaseline.baselineOffset })
     , m_initialStrut(initialConstraints.heightAndBaseline.strut)
-    , m_contentLogicalHeight(initialConstraints.heightAndBaseline.height)
+    , m_lineLogicalHeight(initialConstraints.heightAndBaseline.height)
     , m_lineLogicalWidth(initialConstraints.availableWidth)
     , m_skipVerticalAligment(skipVerticalAligment == SkipVerticalAligment::Yes)
@@ -92 +92 @@
             m_baseline = { };
             m_baselineTop = { };
-            m_contentLogicalHeight = { };
+            m_lineLogicalHeight = { };
         }
 
         // Remove descent when all content is baseline aligned but none of them have descent.
         if (InlineFormattingContext::Quirks::lineDescentNeedsCollapsing(m_layoutState, *m_content)) {
-            m_contentLogicalHeight -= m_baseline.descent;
+            m_lineLogicalHeight -= m_baseline.descent;
             m_baseline.descent = { };
         }
@@ -320 +320 @@
         if (halfLeading.ascent > 0)
             m_baseline.ascent = std::max(m_baseline.ascent, halfLeading.ascent);
-        m_contentLogicalHeight = std::max(m_contentLogicalHeight, m_baseline.height());
+        m_lineLogicalHeight = std::max(m_lineLogicalHeight, m_baseline.height());
         return;
     }
@@ -329 +329 @@
         m_baseline.ascent = std::max(m_initialStrut->ascent, m_baseline.ascent);
         m_baseline.descent = std::max(m_initialStrut->descent, m_baseline.descent);
-        m_contentLogicalHeight = std::max(m_contentLogicalHeight, m_baseline.height());
+        m_lineLogicalHeight = std::max(m_lineLogicalHeight, m_baseline.height());
         m_initialStrut = { };
         return;
@@ -344 +344 @@
             m_baseline.descent = std::max(inlineBlockBaseline.descent, m_baseline.descent);
             m_baseline.ascent = std::max(inlineBlockBaseline.ascent, m_baseline.ascent);
-            m_contentLogicalHeight = std::max(std::max(m_contentLogicalHeight, runHeight), m_baseline.height());
+            m_lineLogicalHeight = std::max(std::max(m_lineLogicalHeight, runHeight), m_baseline.height());
             break;
         }
         m_baseline.descent = std::max<LayoutUnit>(0, m_baseline.descent);
         m_baseline.ascent = std::max(runHeight, m_baseline.ascent);
-        m_contentLogicalHeight = std::max(m_contentLogicalHeight, m_baseline.height());
+        m_lineLogicalHeight = std::max(m_lineLogicalHeight, m_baseline.height());
         break;
     case VerticalAlign::Top:
         // Top align content never changes the baseline offset, it only pushes the bottom of the line further down.
-        m_contentLogicalHeight = std::max(runHeight, m_contentLogicalHeight);
+        m_lineLogicalHeight = std::max(runHeight, m_lineLogicalHeight);
         break;
     case VerticalAlign::Bottom:
-        if (m_contentLogicalHeight < runHeight) {
-            m_baselineTop += runHeight - m_contentLogicalHeight;
-            m_contentLogicalHeight = runHeight;
+        if (m_lineLogicalHeight < runHeight) {
+            m_baselineTop += runHeight - m_lineLogicalHeight;
+            m_lineLogicalHeight = runHeight;
         }
         break;

trunk/Source/WebCore/layout/inlineformatting/InlineLine.h

@@ -116 +116 @@
 
     LayoutUnit logicalWidth() const { return m_lineLogicalWidth; }
-    LayoutUnit logicalHeight() const { return m_contentLogicalHeight; }
+    LayoutUnit logicalHeight() const { return m_lineLogicalHeight; }
 
     LayoutUnit contentLogicalWidth() const { return m_contentLogicalWidth; }
@@ -146 +146 @@
 
     Optional<LineBox::Baseline> m_initialStrut;
-    LayoutUnit m_contentLogicalHeight;
+    LayoutUnit m_lineLogicalHeight;
     LayoutUnit m_lineLogicalWidth;
     bool m_skipVerticalAligment { false };