Changeset 246678 in webkit

Timestamp:

Jun 21, 2019 8:31:02 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] LineBox::Baseline should have a height getter.
​https://bugs.webkit.org/show_bug.cgi?id=199092
<rdar://problem/51966958>

Reviewed by Antti Koivisto.

The baseline height does not need to be a getter on the Line (no one calls it).

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::adjustBaselineAndLineHeight):

• layout/inlineformatting/InlineLine.h:

(WebCore::Layout::Line::contentLogicalWidth const):
(WebCore::Layout::Line::baselineAlignedContentHeight const): Deleted.

• layout/inlineformatting/InlineLineBox.h:

(WebCore::Layout::LineBox::Baseline::height const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLine.cpp (modified) (3 diffs)
• layout/inlineformatting/InlineLine.h (modified) (1 diff)
• layout/inlineformatting/InlineLineBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] LineBox::Baseline should have a height getter.
+        https://bugs.webkit.org/show_bug.cgi?id=199092
+        <rdar://problem/51966958>
+
+        Reviewed by Antti Koivisto.
+
+        The baseline height does not need to be a getter on the Line (no one calls it).
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::adjustBaselineAndLineHeight):
+        * layout/inlineformatting/InlineLine.h:
+        (WebCore::Layout::Line::contentLogicalWidth const):
+        (WebCore::Layout::Line::baselineAlignedContentHeight const): Deleted.
+        * layout/inlineformatting/InlineLineBox.h:
+        (WebCore::Layout::LineBox::Baseline::height const):
+
 2019-06-21  Michael Catanzaro  <mcatanzaro@igalia.com>
 

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

@@ -320 +320 @@
         if (halfLeading.ascent > 0)
             m_baseline.ascent = std::max(m_baseline.ascent, halfLeading.ascent);
-        m_contentLogicalHeight = std::max(m_contentLogicalHeight, baselineAlignedContentHeight());
+        m_contentLogicalHeight = std::max(m_contentLogicalHeight, 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, baselineAlignedContentHeight());
+        m_contentLogicalHeight = std::max(m_contentLogicalHeight, 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), baselineAlignedContentHeight());
+            m_contentLogicalHeight = std::max(std::max(m_contentLogicalHeight, 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, baselineAlignedContentHeight());
+        m_contentLogicalHeight = std::max(m_contentLogicalHeight, m_baseline.height());
         break;
     case VerticalAlign::Top:

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

@@ -119 +119 @@
 
     LayoutUnit contentLogicalWidth() const { return m_contentLogicalWidth; }
-    LayoutUnit baselineAlignedContentHeight() const { return m_baseline.ascent + m_baseline.descent; }
     LayoutUnit baselineOffset() const { return m_baseline.ascent + m_baselineTop; }
 

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

@@ -36 +36 @@
 public:
     struct Baseline {
+        LayoutUnit height() const { return ascent + descent; }
+
         LayoutUnit ascent;
         LayoutUnit descent;