Changeset 246633 in webkit

Timestamp:

Jun 20, 2019 6:59:12 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Introduce Line::InitialConstraints
​https://bugs.webkit.org/show_bug.cgi?id=199056
<rdar://problem/51927597>

Reviewed by Antti Koivisto.

Line::InitialConstraints, as the name suggests, holds the initial constraint values for the new line.

• 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):

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::Line):
(WebCore::Layout::m_skipVerticalAligment):
(WebCore::Layout::m_lineLogicalWidth): Deleted.

• layout/inlineformatting/InlineLine.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-20  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Introduce Line::InitialConstraints
+        https://bugs.webkit.org/show_bug.cgi?id=199056
+        <rdar://problem/51927597>
+
+        Reviewed by Antti Koivisto.
+
+        Line::InitialConstraints, as the name suggests, holds the initial constraint values for the new line. 
+
+        * 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):
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::Line):
+        (WebCore::Layout::m_skipVerticalAligment):
+        (WebCore::Layout::m_lineLogicalWidth): Deleted.
+        * layout/inlineformatting/InlineLine.h:
+
 2019-06-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -67 +67 @@
 
         struct LineInput {
-            enum class SkipVerticalAligment { No, Yes };
-            LineInput(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth, SkipVerticalAligment, unsigned firstInlineItemIndex, const InlineItems&);
+            LineInput(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth, Line::SkipVerticalAligment, unsigned firstInlineItemIndex, const InlineItems&);
             struct HorizontalConstraint {
                 HorizontalConstraint(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth);
@@ -77 +76 @@
             HorizontalConstraint horizontalConstraint;
             // FIXME Alternatively we could just have a second pass with vertical positioning (preferred width computation opts out) 
-            SkipVerticalAligment skipVerticalAligment;
+            Line::SkipVerticalAligment skipVerticalAligment;
             unsigned firstInlineItemIndex { 0 };
             const InlineItems& inlineItems;

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

@@ -79 +79 @@
 }
 
-InlineFormattingContext::LineLayout::LineInput::LineInput(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth, SkipVerticalAligment skipVerticalAligment, unsigned firstInlineItemIndex, const InlineItems& inlineItems)
+InlineFormattingContext::LineLayout::LineInput::LineInput(LayoutPoint logicalTopLeft, LayoutUnit availableLogicalWidth, Line::SkipVerticalAligment skipVerticalAligment, unsigned firstInlineItemIndex, const InlineItems& inlineItems)
     : horizontalConstraint(logicalTopLeft, availableLogicalWidth)
     , skipVerticalAligment(skipVerticalAligment)
@@ -128 +128 @@
 InlineFormattingContext::LineLayout::LineContent InlineFormattingContext::LineLayout::placeInlineItems(const LineInput& lineInput) const
 {
-    std::unique_ptr<Line> line;
-    if (lineInput.skipVerticalAligment == LineInput::SkipVerticalAligment::No) {
-        auto mimimumLineHeight = m_formattingRoot.style().computedLineHeight();
-        auto initialBaselineOffset = Line::halfLeadingMetrics(m_formattingRoot.style().fontMetrics(), mimimumLineHeight).ascent;
-        line = std::make_unique<Line>(layoutState(), lineInput.horizontalConstraint.logicalTopLeft, lineInput.horizontalConstraint.availableLogicalWidth, mimimumLineHeight, initialBaselineOffset);
-    } else
-        line = std::make_unique<Line>(layoutState(), lineInput.horizontalConstraint.logicalTopLeft.x(), lineInput.horizontalConstraint.availableLogicalWidth);
+    auto mimimumLineHeight = m_formattingRoot.style().computedLineHeight();
+    auto initialBaselineOffset = Line::halfLeadingMetrics(m_formattingRoot.style().fontMetrics(), mimimumLineHeight).ascent;
+    auto initialLineConstraints = Line::InitialConstraints {
+        lineInput.horizontalConstraint.logicalTopLeft,
+        lineInput.horizontalConstraint.availableLogicalWidth,
+        mimimumLineHeight,
+        initialBaselineOffset
+    };
+    auto line = Line { layoutState(), initialLineConstraints, lineInput.skipVerticalAligment };
 
     Vector<WeakPtr<InlineItem>> floats;
@@ -145 +147 @@
         committedInlineItemCount += uncommittedContent.size();
         for (auto& uncommittedRun : uncommittedContent.runs())
-            line->append(uncommittedRun.inlineItem, uncommittedRun.logicalWidth);
+            line.append(uncommittedRun.inlineItem, uncommittedRun.logicalWidth);
         uncommittedContent.reset();
     };
@@ -153 +155 @@
         ASSERT(committedInlineItemCount || lineHasFloatBox);
         auto lastCommittedIndex = committedInlineItemCount ? Optional<unsigned> { lineInput.firstInlineItemIndex + (committedInlineItemCount - 1) } : WTF::nullopt;
-        return LineContent { lastCommittedIndex, WTFMove(floats), line->close() };
+        return LineContent { lastCommittedIndex, 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) {
-        auto availableWidth = line->availableWidth() - uncommittedContent.width();
-        auto currentLogicalRight = line->contentLogicalRight() + uncommittedContent.width();
+        auto availableWidth = line.availableWidth() - uncommittedContent.width();
+        auto currentLogicalRight = line.contentLogicalRight() + uncommittedContent.width();
         auto& inlineItem = lineInput.inlineItems[inlineItemIndex];
         auto itemLogicalWidth = inlineItemWidth(layoutState(), *inlineItem, currentLogicalRight);
 
         // FIXME: Ensure LineContext::trimmableWidth includes uncommitted content if needed.
-        auto lineIsConsideredEmpty = !line->hasContent() && !lineHasFloatBox;
-        auto breakingContext = lineBreaker.breakingContext(*inlineItem, itemLogicalWidth, { availableWidth, currentLogicalRight, line->trailingTrimmableWidth(), lineIsConsideredEmpty });
+        auto lineIsConsideredEmpty = !line.hasContent() && !lineHasFloatBox;
+        auto breakingContext = lineBreaker.breakingContext(*inlineItem, itemLogicalWidth, { availableWidth, currentLogicalRight, line.trailingTrimmableWidth(), lineIsConsideredEmpty });
         if (breakingContext.isAtBreakingOpportunity)
             commitPendingContent();
@@ -187 +189 @@
             // Shrink availble space for current line and move existing inline runs.
             auto floatBoxWidth = layoutState().displayBoxForLayoutBox(floatBox).marginBoxWidth();
-            floatBox.isLeftFloatingPositioned() ? line->moveLogicalLeft(floatBoxWidth) : line->moveLogicalRight(floatBoxWidth);
+            floatBox.isLeftFloatingPositioned() ? line.moveLogicalLeft(floatBoxWidth) : line.moveLogicalRight(floatBoxWidth);
             floats.append(makeWeakPtr(*inlineItem));
             ++committedInlineItemCount;
@@ -252 +254 @@
     unsigned currentInlineItemIndex = 0;
     while (currentInlineItemIndex < inlineItems.size()) {
-        auto lineInput = LineInput { { lineLogicalLeft, lineLogicalTop }, widthConstraint, LineInput::SkipVerticalAligment::No, currentInlineItemIndex, inlineItems };
+        auto lineInput = LineInput { { lineLogicalLeft, lineLogicalTop }, widthConstraint, Line::SkipVerticalAligment::No, currentInlineItemIndex, inlineItems };
         applyFloatConstraint(lineInput);
         auto lineContent = placeInlineItems(lineInput);
@@ -274 +276 @@
     unsigned currentInlineItemIndex = 0;
     while (currentInlineItemIndex < inlineItems.size()) {
-        auto lineContent = placeInlineItems({ { }, widthConstraint, LineInput::SkipVerticalAligment::Yes, currentInlineItemIndex, inlineItems });
+        auto lineContent = placeInlineItems({ { }, widthConstraint, Line::SkipVerticalAligment::Yes, currentInlineItemIndex, inlineItems });
         currentInlineItemIndex = *lineContent.lastInlineItemIndex + 1;
         LayoutUnit floatsWidth;

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

@@ -45 +45 @@
 }
 
-Line::Line(const LayoutState& layoutState, LayoutUnit logicalLeft, LayoutUnit availableWidth)
+Line::Line(const LayoutState& layoutState, const InitialConstraints& initialConstraints, SkipVerticalAligment skipVerticalAligment)
     : m_layoutState(layoutState)
     , m_content(std::make_unique<Line::Content>())
-    , m_logicalTopLeft(logicalLeft, 0)
-    , m_lineLogicalWidth(availableWidth)
-    , m_skipVerticalAligment(true)
-{
-}
-
-Line::Line(const LayoutState& layoutState, const LayoutPoint& topLeft, LayoutUnit availableWidth, LayoutUnit minimumHeight, LayoutUnit baselineOffset)
-    : m_layoutState(layoutState)
-    , m_content(std::make_unique<Line::Content>())
-    , m_logicalTopLeft(topLeft)
-    , m_baseline({ baselineOffset, minimumHeight - baselineOffset })
-    , m_contentLogicalHeight(minimumHeight)
-    , m_lineLogicalWidth(availableWidth)
+    , m_logicalTopLeft(initialConstraints.topLeft)
+    , m_baseline({ initialConstraints.baselineOffset, initialConstraints.height - initialConstraints.baselineOffset })
+    , m_contentLogicalHeight(initialConstraints.height)
+    , m_lineLogicalWidth(initialConstraints.availableWidth)
+    , m_skipVerticalAligment(skipVerticalAligment == SkipVerticalAligment::Yes)
 {
 }

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

@@ -39 +39 @@
     WTF_MAKE_ISO_ALLOCATED(Line);
 public:
-    Line(const LayoutState&, const LayoutPoint& topLeft, LayoutUnit availableWidth, LayoutUnit minimumLineHeight, LayoutUnit baselineOffset);
-    Line(const LayoutState&, LayoutUnit logicalLeft, LayoutUnit availableWidth);
+    struct InitialConstraints {
+        LayoutPoint topLeft;
+        LayoutUnit availableWidth;
+        LayoutUnit height;
+        LayoutUnit baselineOffset;
+    };
+    enum class SkipVerticalAligment { No, Yes };
+    Line(const LayoutState&, const InitialConstraints&, SkipVerticalAligment);
 
     class Content {