Changeset 246158 in webkit

Timestamp:

Jun 6, 2019 9:53:29 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Move baseline and line height computation to a dedicated function
​https://bugs.webkit.org/show_bug.cgi?id=198611
<rdar://problem/51482708>

Reviewed by Antti Koivisto.

This is in preparation for adding vertical aligment.

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::appendInlineContainerStart):
(WebCore::Layout::Line::appendNonReplacedInlineBox):
(WebCore::Layout::Line::adjustBaselineAndLineHeight):

• layout/inlineformatting/InlineLine.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-06  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Move baseline and line height computation to a dedicated function
+        https://bugs.webkit.org/show_bug.cgi?id=198611
+        <rdar://problem/51482708>
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for adding vertical aligment.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::appendInlineContainerStart):
+        (WebCore::Layout::Line::appendNonReplacedInlineBox):
+        (WebCore::Layout::Line::adjustBaselineAndLineHeight):
+        * layout/inlineformatting/InlineLine.h:
+
 2019-06-06  Antti Koivisto  <antti@apple.com>
 

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

@@ -122 +122 @@
 void Line::appendInlineContainerStart(const InlineItem& inlineItem, InlineItemSize runSize)
 {
+    if (runSize.logicalHeight)
+        adjustBaselineAndLineHeight(inlineItem, *runSize.logicalHeight);
+
     auto& layoutBox = inlineItem.layoutBox();
-    auto& style = layoutBox.style();
-    auto& fontMetrics = style.fontMetrics();
-
-    auto alignAndAdjustLineHeight = [&] {
-        LayoutUnit inlineBoxHeight = style.computedLineHeight();
-
-        auto halfLeading = halfLeadingMetrics(fontMetrics, inlineBoxHeight);
-        if (halfLeading.depth > 0)
-            m_logicalHeight.depth = std::max(m_logicalHeight.depth, halfLeading.depth);
-        if (halfLeading.height > 0)
-            m_logicalHeight.height = std::max(m_logicalHeight.height, halfLeading.height);
-    };
-
-    alignAndAdjustLineHeight();
+    auto& fontMetrics = layoutBox.style().fontMetrics();
     auto& displayBox = m_layoutState.displayBoxForLayoutBox(layoutBox);
+
     auto logicalTop = -fontMetrics.ascent() - displayBox.borderTop() - displayBox.paddingTop().valueOr(0);
     auto logicalRect = Display::Rect { logicalTop, contentLogicalRight(), runSize.logicalWidth, runSize.logicalHeight.valueOr(0) };
@@ -192 +183 @@
 void Line::appendNonReplacedInlineBox(const InlineItem& inlineItem, InlineItemSize runSize)
 {
+    if (runSize.logicalHeight)
+        adjustBaselineAndLineHeight(inlineItem, *runSize.logicalHeight);
+
     auto inlineBoxHeight = runSize.logicalHeight.valueOr(0);
-    auto alignAndAdjustLineHeight = [&] {
-        // FIXME: We need to look inside the inline-block's formatting context and check the lineboxes (if any) to be able to baseline align.
-        if (inlineItem.layoutBox().establishesInlineFormattingContext()) {
-            if (inlineBoxHeight == logicalHeight())
-                return;
-            // FIXME: This fails when the line height difference comes from font-size diff.
-            m_logicalHeight.depth = std::max<LayoutUnit>(0, m_logicalHeight.depth);
-            m_logicalHeight.height = std::max(inlineBoxHeight, m_logicalHeight.height);
-            return;
-        }
-        // 0 descent -> baseline aligment for now.
-        m_logicalHeight.depth = std::max<LayoutUnit>(0, m_logicalHeight.depth);
-        m_logicalHeight.height = std::max(inlineBoxHeight, m_logicalHeight.height);
-    };
-
-    alignAndAdjustLineHeight();
     auto& displayBox = m_layoutState.displayBoxForLayoutBox(inlineItem.layoutBox());
     auto logicalTop = -inlineBoxHeight;
@@ -230 +208 @@
     auto logicalRect = Display::Rect { -ascent, contentLogicalRight(), { }, logicalHeight() };
     m_content->runs().append(std::make_unique<Content::Run>(Display::Run { logicalRect }, inlineItem, false, false));
+}
+
+void Line::adjustBaselineAndLineHeight(const InlineItem& inlineItem, LayoutUnit runHeight)
+{
+    ASSERT(!inlineItem.isContainerEnd() && !inlineItem.isText());
+    auto& layoutBox = inlineItem.layoutBox();
+    auto& style = layoutBox.style();
+
+    if (inlineItem.isContainerStart()) {
+        auto& fontMetrics = style.fontMetrics();
+        auto halfLeading = halfLeadingMetrics(fontMetrics, style.computedLineHeight());
+        if (halfLeading.depth > 0)
+            m_logicalHeight.depth = std::max(m_logicalHeight.depth, halfLeading.depth);
+        if (halfLeading.height > 0)
+            m_logicalHeight.height = std::max(m_logicalHeight.height, halfLeading.height);
+        return;
+    }
+    // Replaced and non-replaced inline level box.
+    // FIXME: We need to look inside the inline-block's formatting context and check the lineboxes (if any) to be able to baseline align.
+    if (layoutBox.establishesInlineFormattingContext()) {
+        if (runHeight == logicalHeight())
+            return;
+        // FIXME: This fails when the line height difference comes from font-size diff.
+        m_logicalHeight.depth = std::max<LayoutUnit>(0, m_logicalHeight.depth);
+        m_logicalHeight.height = std::max(runHeight, m_logicalHeight.height);
+        return;
+    }
+    // 0 descent -> baseline aligment for now.
+    m_logicalHeight.depth = std::max<LayoutUnit>(0, m_logicalHeight.depth);
+    m_logicalHeight.height = std::max(runHeight, m_logicalHeight.height);
 }
 

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

@@ -117 +117 @@
     void removeTrailingTrimmableContent();
 
+    void adjustBaselineAndLineHeight(const InlineItem&, LayoutUnit runHeight);
+
     const LayoutState& m_layoutState;
     std::unique_ptr<Content> m_content;