Changeset 247199 in webkit

Timestamp:

Jul 7, 2019 6:49:57 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Introduce splitPosition to LineLayout
​https://bugs.webkit.org/show_bug.cgi?id=199558
<rdar://problem/52737649>

Reviewed by Antti Koivisto.

This is in preparation for breaking runs at line end.

• layout/inlineformatting/InlineFormattingContext.h:
• layout/inlineformatting/InlineFormattingContextLineLayout.cpp:

(WebCore::Layout::InlineFormattingContext::LineLayout::LineInput::LineInput):
(WebCore::Layout::InlineFormattingContext::LineLayout::placeInlineItems const):
(WebCore::Layout::InlineFormattingContext::LineLayout::layout const):
(WebCore::Layout::InlineFormattingContext::LineLayout::computedIntrinsicWidth const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContext.h (modified) (2 diffs)
• layout/inlineformatting/InlineFormattingContextLineLayout.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-07  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Introduce splitPosition to LineLayout
+        https://bugs.webkit.org/show_bug.cgi?id=199558
+        <rdar://problem/52737649>
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for breaking runs at line end.
+
+        * layout/inlineformatting/InlineFormattingContext.h:
+        * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
+        (WebCore::Layout::InlineFormattingContext::LineLayout::LineInput::LineInput):
+        (WebCore::Layout::InlineFormattingContext::LineLayout::placeInlineItems const):
+        (WebCore::Layout::InlineFormattingContext::LineLayout::layout const):
+        (WebCore::Layout::InlineFormattingContext::LineLayout::computedIntrinsicWidth const):
+
 2019-07-07  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -60 +60 @@
         LayoutState& layoutState() const { return m_formattingContext.layoutState(); }
 
-        struct LineContent {
-            Optional<unsigned> lastInlineItemIndex;
-            Vector<WeakPtr<InlineItem>> floats;
-            std::unique_ptr<Line::Content> runs;
+        struct InlineIndexAndSplitPosition {
+            unsigned index { 0 };
+            Optional<unsigned> splitPosition;
         };
 
         struct LineInput {
-            LineInput(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth, Line::SkipVerticalAligment, unsigned firstInlineItemIndex, const InlineItems&);
+            LineInput(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth, Line::SkipVerticalAligment, InlineIndexAndSplitPosition firstToProcess, const InlineItems&);
             struct HorizontalConstraint {
                 HorizontalConstraint(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth);
@@ -77 +76 @@
             // FIXME Alternatively we could just have a second pass with vertical positioning (preferred width computation opts out) 
             Line::SkipVerticalAligment skipVerticalAligment;
-            unsigned firstInlineItemIndex { 0 };
+            InlineIndexAndSplitPosition firstInlineItem;
             const InlineItems& inlineItems;
             Optional<LayoutUnit> floatMinimumLogicalBottom;
+        };
+
+        struct LineContent {
+            Optional<InlineIndexAndSplitPosition> lastCommitted;
+            Vector<WeakPtr<InlineItem>> floats;
+            std::unique_ptr<Line::Content> runs;
         };
         LineContent placeInlineItems(const LineInput&) const;

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

@@ -79 +79 @@
 }
 
-InlineFormattingContext::LineLayout::LineInput::LineInput(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth, Line::SkipVerticalAligment skipVerticalAligment, unsigned firstInlineItemIndex, const InlineItems& inlineItems)
+InlineFormattingContext::LineLayout::LineInput::LineInput(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth, Line::SkipVerticalAligment skipVerticalAligment, InlineIndexAndSplitPosition firstToProcess, const InlineItems& inlineItems)
     : horizontalConstraint(logicalTopLeft, availableLogicalWidth)
     , skipVerticalAligment(skipVerticalAligment)
-    , firstInlineItemIndex(firstInlineItemIndex)
+    , firstInlineItem(firstToProcess)
     , inlineItems(inlineItems)
 {
@@ -137 +137 @@
     Vector<WeakPtr<InlineItem>> floats;
     unsigned committedInlineItemCount = 0;
+    Optional<unsigned> splitPosition;
 
     UncommittedContent uncommittedContent;
@@ -151 +152 @@
     auto closeLine = [&] {
         ASSERT(committedInlineItemCount || lineHasFloatBox);
-        auto lastCommittedIndex = committedInlineItemCount ? Optional<unsigned> { lineInput.firstInlineItemIndex + (committedInlineItemCount - 1) } : WTF::nullopt;
-        return LineContent { lastCommittedIndex, WTFMove(floats), line.close() };
+        if (!committedInlineItemCount)
+            return LineContent { WTF::nullopt, WTFMove(floats), line.close() };
+        auto lastCommitedItem = InlineIndexAndSplitPosition { lineInput.firstInlineItem.index + (committedInlineItemCount - 1), splitPosition };
+        return LineContent { lastCommitedItem, WTFMove(floats), line.close() };
     };
     LineBreaker lineBreaker;
     // Iterate through the inline content and place the inline boxes on the current line.
-    for (auto inlineItemIndex = lineInput.firstInlineItemIndex; inlineItemIndex < lineInput.inlineItems.size(); ++inlineItemIndex) {
+    for (auto inlineItemIndex = lineInput.firstInlineItem.index; inlineItemIndex < lineInput.inlineItems.size(); ++inlineItemIndex) {
         auto availableWidth = line.availableWidth() - uncommittedContent.width();
         auto currentLogicalRight = line.contentLogicalRight() + uncommittedContent.width();
@@ -249 +252 @@
 
     auto& inlineItems = m_formattingState.inlineItems();
-    unsigned currentInlineItemIndex = 0;
-    while (currentInlineItemIndex < inlineItems.size()) {
-        auto lineInput = LineInput { { lineLogicalLeft, lineLogicalTop }, widthConstraint, Line::SkipVerticalAligment::No, currentInlineItemIndex, inlineItems };
+    InlineIndexAndSplitPosition currentInlineItem;
+    while (currentInlineItem.index < inlineItems.size()) {
+        auto lineInput = LineInput { { lineLogicalLeft, lineLogicalTop }, widthConstraint, Line::SkipVerticalAligment::No, currentInlineItem, inlineItems };
         applyFloatConstraint(lineInput);
         auto lineContent = placeInlineItems(lineInput);
         createDisplayRuns(*lineContent.runs, lineContent.floats, widthConstraint);
-        if (!lineContent.lastInlineItemIndex) {
+        if (!lineContent.lastCommitted) {
             // Floats prevented us putting any content on the line.
             ASSERT(lineInput.floatMinimumLogicalBottom);
@@ -261 +264 @@
             lineLogicalTop = *lineInput.floatMinimumLogicalBottom;
         } else {
-            currentInlineItemIndex = *lineContent.lastInlineItemIndex + 1;
+            currentInlineItem = { lineContent.lastCommitted->index + 1, WTF::nullopt };
             lineLogicalTop = lineContent.runs->logicalBottom();
         }
@@ -271 +274 @@
     LayoutUnit maximumLineWidth;
     auto& inlineItems = m_formattingState.inlineItems();
-    unsigned currentInlineItemIndex = 0;
-    while (currentInlineItemIndex < inlineItems.size()) {
-        auto lineContent = placeInlineItems({ { }, widthConstraint, Line::SkipVerticalAligment::Yes, currentInlineItemIndex, inlineItems });
-        currentInlineItemIndex = *lineContent.lastInlineItemIndex + 1;
+    InlineIndexAndSplitPosition currentInlineItem;
+    while (currentInlineItem.index < inlineItems.size()) {
+        auto lineContent = placeInlineItems({ { }, widthConstraint, Line::SkipVerticalAligment::Yes, currentInlineItem, inlineItems });
+        currentInlineItem = { lineContent.lastCommitted->index + 1, WTF::nullopt };
         LayoutUnit floatsWidth;
         for (auto& floatItem : lineContent.floats)