Changeset 245811 in webkit

Timestamp:

May 28, 2019, 7:51:16 AM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Move intrinsic width computation from InlineFormattingContext to LineLayout
​https://bugs.webkit.org/show_bug.cgi?id=198258

Reviewed by Antti Koivisto.

This is in preparation for sharing even more code between line layout and preferred width computation.

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::layout const):
(WebCore::Layout::InlineFormattingContext::computeIntrinsicWidthConstraints const):

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

(WebCore::Layout::InlineFormattingContext::LineLayout::initializeLine const):
(WebCore::Layout::InlineFormattingContext::LineLayout::layout const):
(WebCore::Layout::InlineFormattingContext::LineLayout::computedIntrinsicWidth const):
(WebCore::Layout::InlineFormattingContext::LineLayout::closeLine const):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-28  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Move intrinsic width computation from InlineFormattingContext to LineLayout
+        https://bugs.webkit.org/show_bug.cgi?id=198258
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for sharing even more code between line layout and preferred width computation. 
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::layout const):
+        (WebCore::Layout::InlineFormattingContext::computeIntrinsicWidthConstraints const):
+        * layout/inlineformatting/InlineFormattingContext.h:
+        * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
+        (WebCore::Layout::InlineFormattingContext::LineLayout::initializeLine const):
+        (WebCore::Layout::InlineFormattingContext::LineLayout::layout const):
+        (WebCore::Layout::InlineFormattingContext::LineLayout::computedIntrinsicWidth const):
+        (WebCore::Layout::InlineFormattingContext::LineLayout::closeLine const):
+
 2019-05-28  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -72 +72 @@
     LOG_WITH_STREAM(FormattingContextLayout, stream << "[Start] -> inline formatting context -> formatting root(" << &root() << ")");
     auto& root = downcast<Container>(this->root());
-    auto usedValues = UsedHorizontalValues { layoutState().displayBoxForLayoutBox(root).contentBoxWidth() };
+    auto availableWidth = layoutState().displayBoxForLayoutBox(root).contentBoxWidth();
+    auto usedValues = UsedHorizontalValues { availableWidth };
     auto* layoutBox = root.firstInFlowOrFloatingChild();
     // Compute width/height for non-text content and margin/border/padding for inline containers.
@@ -94 +95 @@
 
     collectInlineContent();
-    LineLayout(*this).layout();
+    LineLayout(*this).layout(availableWidth);
     LOG_WITH_STREAM(FormattingContextLayout, stream << "[End] -> inline formatting context -> formatting root(" << &root << ")");
 }
@@ -140 +141 @@
             layoutState.displayBoxForLayoutBox(*formattingRoot).setContentBoxWidth(availableWidth ? intrinsicWidths->maximum : intrinsicWidths->minimum);
         }
-        LayoutUnit maxContentLogicalRight;
-        LayoutUnit lineLogicalRight;
-
-        LineBreaker lineBreaker(layoutState);
-        auto& inlineContent = formattingState().inlineItems();
-        for (auto& inlineItem : inlineContent) {
-            auto breakingContext = lineBreaker.breakingContext(*inlineItem, { availableWidth, lineLogicalRight, !lineLogicalRight });
-            if (breakingContext.breakingBehavior == LineBreaker::BreakingBehavior::Wrap)
-                lineLogicalRight = 0;
-            lineLogicalRight += inlineItem->width();
-
-            maxContentLogicalRight = std::max(maxContentLogicalRight, lineLogicalRight);
-        }
-        return maxContentLogicalRight;
+        return LineLayout(*this).computedIntrinsicWidth(availableWidth);
     };
 

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

@@ -54 +54 @@
     public:
         LineLayout(const InlineFormattingContext&);
-        void layout() const;
+        void layout(LayoutUnit widthConstraint) const;
+        LayoutUnit computedIntrinsicWidth(LayoutUnit widthConstraint) const;
 
     private:
         LayoutState& layoutState() const { return m_formattingContext.layoutState(); }
-        void initializeLine(Line&, LayoutUnit lineLogicalTop) const;
+        void initializeLine(Line&, LayoutUnit lineLogicalTop, LayoutUnit widthConstraint) const;
         void closeLine(Line&) const;
         void commitInlineItemToLine(Line&, const InlineItem&) const;

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

@@ -364 +364 @@
 }
 
-void InlineFormattingContext::LineLayout::initializeLine(Line& line, LayoutUnit lineLogicalTop) const
+void InlineFormattingContext::LineLayout::initializeLine(Line& line, LayoutUnit lineLogicalTop, LayoutUnit availableWidth) const
 {
     auto& formattingRootDisplayBox = layoutState().displayBoxForLayoutBox(m_formattingRoot);
     auto lineLogicalLeft = formattingRootDisplayBox.contentBoxLeft();
-    auto availableWidth = formattingRootDisplayBox.contentBoxWidth();
 
     // Check for intruding floats and adjust logical left/available width for this line accordingly.
@@ -400 +399 @@
 }
 
-void InlineFormattingContext::LineLayout::layout() const
+void InlineFormattingContext::LineLayout::layout(LayoutUnit widthConstraint) const
 {
     auto floatingContext = FloatingContext { m_floatingState };
     Line line(layoutState());
-    initializeLine(line, layoutState().displayBoxForLayoutBox(m_formattingRoot).contentBoxTop());
+    initializeLine(line, layoutState().displayBoxForLayoutBox(m_formattingRoot).contentBoxTop(), widthConstraint);
 
     UncommittedContent uncommittedContent;
@@ -413 +412 @@
     };
 
+    auto closeCurrentAndInitializeNewLine = [&] {
+        closeLine(line);
+        initializeLine(line, line.logicalBottom(), widthConstraint);
+    };
+
     LineBreaker lineBreaker(layoutState());
     auto& inlineContent = m_formattingState.inlineItems();
@@ -418 +422 @@
         // Iterate through the inline content and try to put the inline boxes on the current line.
         if (inlineItem->isHardLineBreak()) {
-            // Close the current line then create and immediately close another one.
             commitPendingContent();
             commitInlineItemToLine(line, *inlineItem);
-            closeLine(line);
+            closeCurrentAndInitializeNewLine();
         } else {
             auto availableWidth = line.availableWidth() - uncommittedContent.width();
@@ -436 +439 @@
 
             if (breakingContext.breakingBehavior == LineBreaker::BreakingBehavior::Wrap)
-                closeLine(line);
+                closeCurrentAndInitializeNewLine();
 
             if (inlineItem->isFloat())
@@ -451 +454 @@
     if (!uncommittedContent.isEmpty()) {
         if (line.availableWidth() < uncommittedContent.width())
-            closeLine(line);
+            closeCurrentAndInitializeNewLine();
         commitPendingContent();
     }
     closeLine(line);
+}
+
+LayoutUnit InlineFormattingContext::LineLayout::computedIntrinsicWidth(LayoutUnit widthConstraint) const
+{
+    // FIXME: Consider running it through layout().
+    LayoutUnit maximumLineWidth;
+    LayoutUnit lineLogicalRight;
+    LayoutUnit trimmableTrailingWidth;
+
+    LineBreaker lineBreaker(layoutState());
+    auto& inlineContent = m_formattingState.inlineItems();
+    for (auto& inlineItem : inlineContent) {
+        auto breakingContext = lineBreaker.breakingContext(*inlineItem, { widthConstraint, lineLogicalRight, !lineLogicalRight });
+        if (breakingContext.breakingBehavior == LineBreaker::BreakingBehavior::Wrap) {
+            maximumLineWidth = std::max(maximumLineWidth, lineLogicalRight - trimmableTrailingWidth);
+            trimmableTrailingWidth = { };
+            lineLogicalRight = { };
+        }
+        if (isTrimmableContent(*inlineItem)) {
+            // Skip leading whitespace.
+            if (!lineLogicalRight)
+                continue;
+            trimmableTrailingWidth += inlineItem->width();
+        } else
+            trimmableTrailingWidth = { };
+        lineLogicalRight += inlineItem->width();
+    }
+    return std::max(maximumLineWidth, lineLogicalRight - trimmableTrailingWidth);
 }
 
@@ -557 +588 @@
     if (line.hasContent())
         alignRuns(m_formattingRoot.style().textAlign(), previousLineLastRunIndex.valueOr(-1) + 1, line.availableWidth());
-    initializeLine(line, line.logicalBottom());
 }