Attachment 371504 Details for Bug 198611 – Patch

[patch] Patch

bug-198611-20190606093735.patch (text/plain), 6.70 KB, created by zalan on 2019-06-06 09:37:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-06-06 09:37:39 PDT

Size: 6.70 KB

patch

obsolete

>Subversion Revision: 246152
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8fc6d372cdd63bad4c46895b67ba9fe8d316d235..5d61317f669a540ea3c4abe53ab716a0a8ec1a6f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+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  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][IFC] Layout and preferred width computation should both call placeInlineItems().
>diff --git a/Source/WebCore/layout/inlineformatting/InlineLine.cpp b/Source/WebCore/layout/inlineformatting/InlineLine.cpp
>index 07405ae747471d52fb353ace498a2cc9b87ef6a3..1a4ec258da542a2c19df289c8224d16e1bffdddf 100644
>--- a/Source/WebCore/layout/inlineformatting/InlineLine.cpp
>+++ b/Source/WebCore/layout/inlineformatting/InlineLine.cpp
>@@ -121,22 +121,13 @@ void Line::appendNonBreakableSpace(const InlineItem& inlineItem, const Display::
> 
> void Line::appendInlineContainerStart(const InlineItem& inlineItem, InlineItemSize runSize)
> {
>-    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);
>-    };
>+    if (runSize.logicalHeight)
>+        adjustBaselineAndLineHeight(inlineItem, *runSize.logicalHeight);
> 
>-    alignAndAdjustLineHeight();
>+    auto& layoutBox = inlineItem.layoutBox();
>+    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) };
>     appendNonBreakableSpace(inlineItem, logicalRect);
>@@ -191,23 +182,10 @@ void Line::appendTextContent(const InlineTextItem& inlineItem, InlineItemSize ru
> 
> void Line::appendNonReplacedInlineBox(const InlineItem& inlineItem, InlineItemSize runSize)
> {
>-    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);
>-    };
>+    if (runSize.logicalHeight)
>+        adjustBaselineAndLineHeight(inlineItem, *runSize.logicalHeight);
> 
>-    alignAndAdjustLineHeight();
>+    auto inlineBoxHeight = runSize.logicalHeight.valueOr(0);
>     auto& displayBox = m_layoutState.displayBoxForLayoutBox(inlineItem.layoutBox());
>     auto logicalTop = -inlineBoxHeight;
>     auto horizontalMargin = displayBox.horizontalMargin();
>@@ -231,6 +209,36 @@ void Line::appendHardLineBreak(const InlineItem& inlineItem)
>     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);
>+}
>+
> Line::UsedHeightAndDepth Line::halfLeadingMetrics(const FontMetrics& fontMetrics, LayoutUnit lineLogicalHeight)
> {
>     auto ascent = fontMetrics.ascent();
>diff --git a/Source/WebCore/layout/inlineformatting/InlineLine.h b/Source/WebCore/layout/inlineformatting/InlineLine.h
>index 5857499d6797c06270fc913a83de66e7b4ab3648..82db84f9ba9a9d7a1319385f6e9d7d0014150fe8 100644
>--- a/Source/WebCore/layout/inlineformatting/InlineLine.h
>+++ b/Source/WebCore/layout/inlineformatting/InlineLine.h
>@@ -116,6 +116,8 @@ private:
>     void appendNonBreakableSpace(const InlineItem&, const Display::Rect& logicalRect);
>     void removeTrailingTrimmableContent();
> 
>+    void adjustBaselineAndLineHeight(const InlineItem&, LayoutUnit runHeight);
>+
>     const LayoutState& m_layoutState;
>     std::unique_ptr<Content> m_content;
>     ListHashSet<Content::Run*> m_trimmableContent;

Actions: View | Formatted Diff | Diff

Attachments on bug 198611: 371496 | 371504