Changeset 285860 in webkit

Timestamp:

Nov 16, 2021, 7:07:51 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Fix fast/text/text-indent-inside-float.html
​https://bugs.webkit.org/show_bug.cgi?id=233163

Reviewed by Antti Koivisto.

Percentages must be treated as 0 for the purpose of calculating intrinsic size contributions.
​https://drafts.csswg.org/css-text/#text-indent-property

Note that this patch is in preparation for enabling IFC preferred width computation.

• layout/formattingContexts/inline/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::LineBuilder):
(WebCore::Layout::LineBuilder::initialConstraintsForLine const):

• layout/formattingContexts/inline/InlineLineBuilder.h: Add an "intrinsic mode" which will also be used

for other, preferred width computation specific properties and values.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineLineBuilder.cpp (modified) (3 diffs)
• layout/formattingContexts/inline/InlineLineBuilder.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-16  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Fix fast/text/text-indent-inside-float.html
+        https://bugs.webkit.org/show_bug.cgi?id=233163
+
+        Reviewed by Antti Koivisto.
+
+        Percentages must be treated as 0 for the purpose of calculating intrinsic size contributions.
+        https://drafts.csswg.org/css-text/#text-indent-property
+
+        Note that this patch is in preparation for enabling IFC preferred width computation.
+
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::LineBuilder):
+        (WebCore::Layout::LineBuilder::initialConstraintsForLine const):
+        * layout/formattingContexts/inline/InlineLineBuilder.h: Add an "intrinsic mode" which will also be used
+        for other, preferred width computation specific properties and values.
+
 2021-11-16  Chris Lord  <clord@igalia.com>
 

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

@@ -269 +269 @@
 }
 
-LineBuilder::LineBuilder(InlineFormattingContext& inlineFormattingContext, FloatingState& floatingState, HorizontalConstraints rootHorizontalConstraints, const InlineItems& inlineItems)
-    : m_inlineFormattingContext(inlineFormattingContext)
+LineBuilder::LineBuilder(InlineFormattingContext& inlineFormattingContext, FloatingState& floatingState, HorizontalConstraints rootHorizontalConstraints, const InlineItems& inlineItems, IsIntrinsicWidthMode isIntrinsicWidthMode)
+    : m_isIntrinsicWidthMode(isIntrinsicWidthMode == IsIntrinsicWidthMode::Yes)
+    , m_inlineFormattingContext(inlineFormattingContext)
     , m_inlineFormattingState(&inlineFormattingContext.formattingState())
     , m_floatingState(&floatingState)
@@ -279 +280 @@
 }
 
-LineBuilder::LineBuilder(const InlineFormattingContext& inlineFormattingContext, const InlineItems& inlineItems)
-    : m_inlineFormattingContext(inlineFormattingContext)
+LineBuilder::LineBuilder(const InlineFormattingContext& inlineFormattingContext, const InlineItems& inlineItems, IsIntrinsicWidthMode isIntrinsicWidthMode)
+    : m_isIntrinsicWidthMode(isIntrinsicWidthMode == IsIntrinsicWidthMode::Yes)
+    , m_inlineFormattingContext(inlineFormattingContext)
     , m_line(inlineFormattingContext)
     , m_inlineItems(inlineItems)
@@ -548 +550 @@
         if (textIndent == RenderStyle::initialTextIndent())
             return { };
+        if (m_isIntrinsicWidthMode && textIndent.isPercent()) {
+            // Percentages must be treated as 0 for the purpose of calculating intrinsic size contributions.
+            // https://drafts.csswg.org/css-text/#text-indent-property
+            return { };
+        }
         return { minimumValueForLength(textIndent, initialLineLogicalRect.width()) };
     };

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

@@ -40 +40 @@
 class LineBuilder {
 public:
-    LineBuilder(InlineFormattingContext&, FloatingState&, HorizontalConstraints rootHorizontalConstraints, const InlineItems&);
-    LineBuilder(const InlineFormattingContext&, const InlineItems&);
+    enum class IsIntrinsicWidthMode { No, Yes };
+    LineBuilder(InlineFormattingContext&, FloatingState&, HorizontalConstraints rootHorizontalConstraints, const InlineItems&, IsIntrinsicWidthMode = IsIntrinsicWidthMode::No);
+    LineBuilder(const InlineFormattingContext&, const InlineItems&, IsIntrinsicWidthMode = IsIntrinsicWidthMode::Yes);
 
     struct InlineItemRange {
@@ -121 +122 @@
 private:
     bool m_isFirstLine { false };
+    bool m_isIntrinsicWidthMode { false };
     const InlineFormattingContext& m_inlineFormattingContext;
     InlineFormattingState* m_inlineFormattingState { nullptr };