Changeset 287028 in webkit

Timestamp:

Dec 14, 2021, 9:20:18 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Make the LineBox content (text runs and inline level boxes) relative to the root inline box.
​https://bugs.webkit.org/show_bug.cgi?id=234285

Reviewed by Antti Koivisto.

Let's decouple the root inline box's logical left and the text-align based horizontal offset and
also make the content inside the root inline box relative to it.
This is in preparation for handling text-align with non-RTL content.

• layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:

(WebCore::Layout::InlineDisplayContentBuilder::processNonBidiContent):
(WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):

• layout/formattingContexts/inline/InlineLineBox.cpp:

(WebCore::Layout::LineBox::LineBox):
(WebCore::Layout::LineBox::logicalRectForTextRun const):

• layout/formattingContexts/inline/InlineLineBox.h:

(WebCore::Layout::LineBox::rootInlineBoxAlignmentOffset const):

• layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:

(WebCore::Layout::LineBoxBuilder::build):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp (modified) (3 diffs)
• layout/formattingContexts/inline/InlineLineBox.cpp (modified) (2 diffs)
• layout/formattingContexts/inline/InlineLineBox.h (modified) (3 diffs)
• layout/formattingContexts/inline/InlineLineBoxBuilder.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-14  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Make the LineBox content (text runs and inline level boxes) relative to the root inline box.
+        https://bugs.webkit.org/show_bug.cgi?id=234285
+
+        Reviewed by Antti Koivisto.
+
+        Let's decouple the root inline box's logical left and the text-align based horizontal offset and
+        also make the content inside the root inline box relative to it.
+        This is in preparation for handling text-align with non-RTL content.
+
+        * layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::InlineDisplayContentBuilder::processNonBidiContent):
+        (WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):
+        * layout/formattingContexts/inline/InlineLineBox.cpp:
+        (WebCore::Layout::LineBox::LineBox):
+        (WebCore::Layout::LineBox::logicalRectForTextRun const):
+        * layout/formattingContexts/inline/InlineLineBox.h:
+        (WebCore::Layout::LineBox::rootInlineBoxAlignmentOffset const):
+        * layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
+        (WebCore::Layout::LineBoxBuilder::build):
+
 2021-12-14  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp

@@ -290 +290 @@
 {
     // Create the inline boxes on the current line. This is mostly text and atomic inline boxes.
+    auto rootInlineBoxAlignmentOffset = lineBox.rootInlineBoxAlignmentOffset();
+
     for (auto& lineRun : lineContent.runs) {
         auto& layoutBox = lineRun.layoutBox();
 
         auto logicalRectRelativeToRoot = [&](auto logicalRect) {
-            logicalRect.moveBy(lineBoxLogicalTopLeft);
+            logicalRect.moveBy({ lineBoxLogicalTopLeft.x() + rootInlineBoxAlignmentOffset, lineBoxLogicalTopLeft.y() });
             return logicalRect;
         };
@@ -482 +484 @@
     ancestorStack.push({ }, root());
 
+    auto rootInlineBoxAlignmentOffset = lineBox.rootInlineBoxAlignmentOffset();
     auto contentStartInVisualOrder = InlineLayoutUnit { };
     auto createDisplayBoxesInVisualOrder = [&] {
@@ -491 +494 @@
         }
         // Adjust the content start position with the (text)alignment offset (root inline box has the alignment offset and not the individual runs).
-        contentStartInVisualOrder += rootInlineBoxRect.left();
+        contentStartInVisualOrder += rootInlineBoxAlignmentOffset;
 
         auto contentRightInVisualOrder = contentStartInVisualOrder;

trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.cpp

@@ -35 +35 @@
 namespace Layout {
 
-LineBox::LineBox(const Box& rootLayoutBox, InlineLayoutUnit contentLogicalLeft, InlineLayoutUnit contentLogicalWidth, size_t lineIndex, size_t nonSpanningInlineLevelBoxCount)
-    : m_rootInlineBox({ rootLayoutBox, !lineIndex ? rootLayoutBox.firstLineStyle() : rootLayoutBox.style(), contentLogicalLeft, InlineLayoutSize { contentLogicalWidth, { } }, InlineLevelBox::Type::RootInlineBox })
+LineBox::LineBox(const Box& rootLayoutBox, InlineLayoutUnit rootInlineBoxAlignmentOffset, InlineLayoutUnit contentLogicalWidth, size_t lineIndex, size_t nonSpanningInlineLevelBoxCount)
+    : m_rootInlineBoxAlignmentOffset(rootInlineBoxAlignmentOffset)
+    , m_rootInlineBox({ rootLayoutBox, !lineIndex ? rootLayoutBox.firstLineStyle() : rootLayoutBox.style(), { }, InlineLayoutSize { contentLogicalWidth, { } }, InlineLevelBox::Type::RootInlineBox })
 {
     m_nonRootInlineLevelBoxList.reserveInitialCapacity(nonSpanningInlineLevelBoxCount);
@@ -63 +64 @@
     }
     InlineLayoutUnit logicalHeight = fontMetrics.height();
-    return { runlogicalTop, m_rootInlineBox.logicalLeft() + run.logicalLeft(), run.logicalWidth(), logicalHeight };
+    return { runlogicalTop, run.logicalLeft(), run.logicalWidth(), logicalHeight };
 }
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.h

@@ -60 +60 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    LineBox(const Box& rootLayoutBox, InlineLayoutUnit contentLogicalLeft, InlineLayoutUnit contentLogicalWidth, size_t lineIndex, size_t nonSpanningInlineLevelBoxCount);
+    LineBox(const Box& rootLayoutBox, InlineLayoutUnit rootInlineBoxAlignmentOffset, InlineLayoutUnit contentLogicalWidth, size_t lineIndex, size_t nonSpanningInlineLevelBoxCount);
 
     // Note that the line can have many inline boxes and be "empty" the same time e.g. <div><span></span><span></span></div>
@@ -80 +80 @@
     const InlineLevelBoxList& nonRootInlineLevelBoxes() const { return m_nonRootInlineLevelBoxList; }
 
+    InlineLayoutUnit rootInlineBoxAlignmentOffset() const { return m_rootInlineBoxAlignmentOffset; }
+
 private:
     friend class LineBoxBuilder;
@@ -98 +100 @@
     OptionSet<InlineLevelBox::Type> m_boxTypes;
 
+    InlineLayoutUnit m_rootInlineBoxAlignmentOffset { 0 };
     InlineLevelBox m_rootInlineBox;
     InlineLevelBoxList m_nonRootInlineLevelBoxList;

trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp

@@ -101 +101 @@
 {
     auto textAlign = !lineIndex ? rootBox().firstLineStyle().textAlign() : rootBox().style().textAlign();
-    auto contentLogicalLeft = Layout::horizontalAlignmentOffset(textAlign, lineContent).value_or(InlineLayoutUnit { });
-    auto lineBox = LineBox { rootBox(), contentLogicalLeft, lineContent.contentLogicalWidth, lineIndex, lineContent.nonSpanningInlineLevelBoxCount };
+    auto rootInlineBoxAlignmentOffset = Layout::horizontalAlignmentOffset(textAlign, lineContent).value_or(InlineLayoutUnit { });
+    auto lineBox = LineBox { rootBox(), rootInlineBoxAlignmentOffset, lineContent.contentLogicalWidth, lineIndex, lineContent.nonSpanningInlineLevelBoxCount };
 
     auto lineBoxLogicalHeight = constructAndAlignInlineLevelBoxes(lineBox, lineContent.runs, lineIndex);
@@ -141 +141 @@
             enclosingTopAndBottom.bottom = std::max(enclosingTopAndBottom.bottom, borderBox.bottom());
         }
-        return InlineDisplay::Line { lineBoxLogicalRect, scrollableOverflowRect, enclosingTopAndBottom, rootInlineBox.logicalTop() + rootInlineBox.baseline(), rootInlineBox.logicalLeft(), rootInlineBox.logicalWidth() };
+        return InlineDisplay::Line { lineBoxLogicalRect, scrollableOverflowRect, enclosingTopAndBottom, rootInlineBox.logicalTop() + rootInlineBox.baseline(), rootInlineBoxAlignmentOffset + rootInlineBox.logicalLeft(), rootInlineBox.logicalWidth() };
     };
     return { line(), lineBox };