Changeset 293646 in webkit

Timestamp:

Apr 30, 2022 8:30:19 AM (2 years ago)

Author:

Alan Bujtas

Message:

ASSERTION FAILED: *trailingRunIndex >= overflowingRunIndex in WebCore::Layout::InlineContentBreaker::tryBreakingNextOverflowingRuns
​https://bugs.webkit.org/show_bug.cgi?id=239838
<rdar://problem/92455051>

Reviewed by Antti Koivisto.

Source/WebCore:

Take partial text overflow into account when computing intrinsic width.

Test: fast/inline/overflowing-content-inside-inline-box-crash.html

• layout/formattingContexts/inline/InlineFormattingContext.cpp:

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

• layout/formattingContexts/inline/InlineLineBuilder.cpp:

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

• layout/formattingContexts/inline/InlineLineBuilder.h:

LayoutTests:

• fast/inline/overflowing-content-inside-inline-box-crash-expected.txt: Added.
• fast/inline/overflowing-content-inside-inline-box-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/overflowing-content-inside-inline-box-crash-expected.txt (added)
• LayoutTests/fast/inline/overflowing-content-inside-inline-box-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-30  Alan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: *trailingRunIndex >= overflowingRunIndex in WebCore::Layout::InlineContentBreaker::tryBreakingNextOverflowingRuns
+        https://bugs.webkit.org/show_bug.cgi?id=239838
+        <rdar://problem/92455051>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/overflowing-content-inside-inline-box-crash-expected.txt: Added.
+        * fast/inline/overflowing-content-inside-inline-box-crash.html: Added.
+
 2022-04-30  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-30  Alan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: *trailingRunIndex >= overflowingRunIndex in WebCore::Layout::InlineContentBreaker::tryBreakingNextOverflowingRuns
+        https://bugs.webkit.org/show_bug.cgi?id=239838
+        <rdar://problem/92455051>
+
+        Reviewed by Antti Koivisto.
+
+        Take partial text overflow into account when computing intrinsic width.
+
+        Test: fast/inline/overflowing-content-inside-inline-box-crash.html
+
+        * layout/formattingContexts/inline/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthForConstraint const):
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::computedIntrinsicWidth):
+        * layout/formattingContexts/inline/InlineLineBuilder.h:
+
 2022-04-30  Alan Bujtas  <zalan@apple.com>
 

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

@@ -433 +433 @@
     while (!layoutRange.isEmpty()) {
         auto intrinsicContent = lineBuilder.computedIntrinsicWidth(layoutRange, previousLine);
-        layoutRange.start = intrinsicContent.inlineItemRange.end;
         maximumLineWidth = std::max(maximumLineWidth, intrinsicContent.logicalWidth);
-        previousLine = LineBuilder::PreviousLine { };
+
+        layoutRange.start = !intrinsicContent.partialOverflowingContent ? intrinsicContent.inlineItemRange.end : intrinsicContent.inlineItemRange.end - 1;
+        previousLine = LineBuilder::PreviousLine { intrinsicContent.inlineItemRange, { }, { }, intrinsicContent.partialOverflowingContent };
         // FIXME: Add support for clear.
         for (auto* floatBox : intrinsicContent.floats)

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

@@ -408 +408 @@
     auto committedRange = close(needsLayoutRange, committedContent);
     auto lineWidth = lineConstraints.logicalRect.left() + lineConstraints.marginStart + m_line.contentLogicalWidth();
-    return { committedRange, lineWidth, m_floats };
+    auto overflow = std::optional<PartialContent> { };
+    if (committedContent.partialTrailingContentLength)
+        overflow = { committedContent.partialTrailingContentLength, committedContent.overflowLogicalWidth };
+    return { committedRange, lineWidth, overflow, m_floats };
 }
 

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

@@ -63 +63 @@
         std::optional<PartialContent> partialOverflowingContent { };
         // Content width measured during line breaking (avoid double-measuring).
-        std::optional<InlineLayoutUnit> trailingOverflowingContentWidth;
+        std::optional<InlineLayoutUnit> trailingOverflowingContentWidth { };
     };
     using FloatList = Vector<const Box*>;
@@ -89 +89 @@
         InlineItemRange inlineItemRange;
         InlineLayoutUnit logicalWidth { 0 };
+        std::optional<PartialContent> partialOverflowingContent { };
         const FloatList& floats;
     };