Changeset 285806 in webkit

Timestamp:

Nov 15, 2021, 6:47:03 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Take text-indent into account when computing preferred width
​https://bugs.webkit.org/show_bug.cgi?id=233115

Reviewed by Antti Koivisto.

• layout/formattingContexts/inline/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthForConstraint const):

• layout/formattingContexts/inline/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::computedIntrinsicWidth):

• layout/formattingContexts/inline/InlineLineBuilder.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineFormattingContext.cpp (modified) (1 diff)
• layout/formattingContexts/inline/InlineLineBuilder.cpp (modified) (1 diff)
• layout/formattingContexts/inline/InlineLineBuilder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-15  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Take text-indent into account when computing preferred width
+        https://bugs.webkit.org/show_bug.cgi?id=233115
+
+        Reviewed by Antti Koivisto.
+
+        * layout/formattingContexts/inline/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthForConstraint const):
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::computedIntrinsicWidth):
+        * layout/formattingContexts/inline/InlineLineBuilder.h:
+
 2021-11-15  Enrique Ocaña González  <eocanha@igalia.com>
 

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

@@ -423 +423 @@
     auto maximumLineWidth = InlineLayoutUnit { };
     auto maximumFloatWidth = LayoutUnit { };
+    auto isFirstLine = true;
     while (!layoutRange.isEmpty()) {
-        auto intrinsicContent = lineBuilder.computedIntrinsicWidth(layoutRange, availableWidth);
+        auto intrinsicContent = lineBuilder.computedIntrinsicWidth(layoutRange, availableWidth, isFirstLine);
         layoutRange.start = intrinsicContent.inlineItemRange.end;
         maximumLineWidth = std::max(maximumLineWidth, intrinsicContent.logicalWidth);
+        isFirstLine = false;
         // FIXME: Add support for clear.
         for (auto* floatBox : intrinsicContent.floats)

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

@@ -324 +324 @@
 }
 
-LineBuilder::IntrinsicContent LineBuilder::computedIntrinsicWidth(const InlineItemRange& needsLayoutRange, InlineLayoutUnit availableWidth)
-{
-    initialize({ { { }, { availableWidth, maxInlineLayoutUnit() } }, false }, false, { }, { }, { });
+LineBuilder::IntrinsicContent LineBuilder::computedIntrinsicWidth(const InlineItemRange& needsLayoutRange, InlineLayoutUnit availableWidth, bool isFirstLine)
+{
+    auto lineConstraints = initialConstraintsForLine({ 0, 0, availableWidth, 0 }, isFirstLine);
+    initialize(lineConstraints, isFirstLine, needsLayoutRange.start, { }, { });
+
     auto committedContent = placeInlineContent(needsLayoutRange);
     auto committedRange = close(needsLayoutRange, committedContent);
-    return { committedRange, m_line.contentLogicalWidth(), m_floats };
+    auto lineWidth = lineConstraints.logicalRect.left() + m_line.contentLogicalWidth();
+    return { committedRange, lineWidth, m_floats };
 }
 

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

@@ -72 +72 @@
         const FloatList& floats;
     };
-    IntrinsicContent computedIntrinsicWidth(const InlineItemRange&, InlineLayoutUnit availableWidth);
+    IntrinsicContent computedIntrinsicWidth(const InlineItemRange&, InlineLayoutUnit availableWidth, bool isFirstLine);
 
 private: