Changeset 286534 in webkit

Timestamp:

Dec 4, 2021, 8:51:39 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Compute isFirstBox/isLastBox for text content
​https://bugs.webkit.org/show_bug.cgi?id=233850

Reviewed by Antti Koivisto.

This is in preparation for helping the iterator interface to compute renderer (layout box) boundaries for text content.

• layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:

(WebCore::Layout::InlineDisplayContentBuilder::appendTextDisplayBox):
(WebCore::Layout::InlineDisplayContentBuilder::computeIsFirstIsLastBoxForInlineContent):

• layout/formattingContexts/inline/InlineDisplayContentBuilder.h:
• layout/formattingContexts/inline/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::layoutInFlowContent):
(WebCore::Layout::InlineFormattingContext::lineLayoutForIntergration):

• layout/formattingContexts/inline/display/InlineDisplayBox.h:

(WebCore::InlineDisplay::Box::setIsFirstBox):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp (modified) (2 diffs)
• layout/formattingContexts/inline/InlineDisplayContentBuilder.h (modified) (1 diff)
• layout/formattingContexts/inline/InlineFormattingContext.cpp (modified) (2 diffs)
• layout/formattingContexts/inline/display/InlineDisplayBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-04  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Compute isFirstBox/isLastBox for text content
+        https://bugs.webkit.org/show_bug.cgi?id=233850
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for helping the iterator interface to compute renderer (layout box) boundaries for text content.
+
+        * layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::InlineDisplayContentBuilder::appendTextDisplayBox):
+        (WebCore::Layout::InlineDisplayContentBuilder::computeIsFirstIsLastBoxForInlineContent):
+        * layout/formattingContexts/inline/InlineDisplayContentBuilder.h:
+        * layout/formattingContexts/inline/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::layoutInFlowContent):
+        (WebCore::Layout::InlineFormattingContext::lineLayoutForIntergration):
+        * layout/formattingContexts/inline/display/InlineDisplayBox.h:
+        (WebCore::InlineDisplay::Box::setIsFirstBox):
+
 2021-12-04  Antoine Quint  <graouts@webkit.org>
 

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

@@ -124 +124 @@
         , inkOverflow()
         , lineRun.expansion()
-        , InlineDisplay::Box::Text { text->start, text->length, content, adjustedContentToRender(), text->needsHyphen } });
+        , InlineDisplay::Box::Text { text->start, text->length, content, adjustedContentToRender(), text->needsHyphen }
+        , true
+        , { } });
 }
 
@@ -650 +652 @@
 }
 
+void InlineDisplayContentBuilder::computeIsFirstIsLastBoxForInlineContent(DisplayBoxes& boxes)
+{
+    HashMap<const Box*, size_t> lastDisplayBoxForInlineTextBoxIndexes;
+    ASSERT(boxes[0].isRootInlineBox());
+    for (size_t index = 1; index < boxes.size(); ++index) {
+        auto& displayBox = boxes[index];
+        // FIXME: Transition the inline box isFirst/isLast computation here as well.
+        if (!displayBox.isText())
+            continue;
+        auto& layoutBox = displayBox.layoutBox();
+        if (!lastDisplayBoxForInlineTextBoxIndexes.contains(&layoutBox))
+            displayBox.setIsFirstBox(true);
+        lastDisplayBoxForInlineTextBoxIndexes.set(&layoutBox, index);
+    }
+    for (auto lastDisplayBoxForInlineTextBoxIndex : lastDisplayBoxForInlineTextBoxIndexes)
+        boxes[lastDisplayBoxForInlineTextBoxIndex.value].setIsLastBox(true);
+}
+
 }
 }

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

@@ -44 +44 @@
     DisplayBoxes build(const LineBuilder::LineContent&, const LineBox&, const InlineRect& lineBoxLogicalRect, const size_t lineIndex);
 
+    static void computeIsFirstIsLastBoxForInlineContent(DisplayBoxes&);
+
 private:
     void processNonBidiContent(const LineBuilder::LineContent&, const LineBox&, const InlineLayoutPoint& lineBoxLogicalTopLeft, DisplayBoxes&);

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

@@ -146 +146 @@
     lineLayout(inlineItems, { 0, inlineItems.size() }, constraints);
     computeStaticPositionForOutOfFlowContent(formattingState().outOfFlowBoxes());
+    InlineDisplayContentBuilder::computeIsFirstIsLastBoxForInlineContent(formattingState().boxes());
     LOG_WITH_STREAM(FormattingContextLayout, stream << "[End] -> inline formatting context -> formatting root(" << &root() << ")");
 }
@@ -156 +157 @@
     lineLayout(inlineItems, { 0, inlineItems.size() }, constraints);
     computeStaticPositionForOutOfFlowContent(formattingState().outOfFlowBoxes());
+    InlineDisplayContentBuilder::computeIsFirstIsLastBoxForInlineContent(formattingState().boxes());
 }
 

trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayBox.h

@@ -131 +131 @@
 
     void setIsLastBox(bool isLastBox) { m_isLastWithinInlineLevelBox = isLastBox; }
+    void setIsFirstBox(bool isFirstBox) { m_isFirstWithinInlineLevelBox = isFirstBox; }
 
 private: