Changeset 283440 in webkit

Timestamp:

Oct 2, 2021, 6:34:43 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Do not reuse the overflowing width on the next line when first line style is different
​https://bugs.webkit.org/show_bug.cgi?id=231107

Reviewed by Antti Koivisto.

Let's compute the leading text content width at the next line (instead of reusing the overflowing trailing width), when the first line style is present and font-cascades differ.

• layout/formattingContexts/inline/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::handleInlineContent):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-02  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Do not reuse the overflowing width on the next line when first line style is different
+        https://bugs.webkit.org/show_bug.cgi?id=231107
+
+        Reviewed by Antti Koivisto.
+
+        Let's compute the leading text content width at the next line (instead of reusing the overflowing trailing width), when the first line style is present and font-cascades differ.
+
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::handleInlineContent):
+
 2021-10-02  Ziran Sun  <zsun@igalia.com>
 

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

@@ -726 +726 @@
         if (inlineTextItem.isWhitespace())
             return { };
+        auto& overflowingRun = candidateRuns.first();
+        if (m_isFirstLine) {
+            auto& usedStyle = overflowingRun.style;
+            auto& style = overflowingRun.inlineItem.style();
+            if (&usedStyle != &style && usedStyle.fontCascade() != style.fontCascade()) {
+                // We may have the incorrect text width when styles differ. Just re-measure the text content when we place it on the next line.
+                return { };
+            }
+        }
+        auto logicalWidthForNextLineAsLeading = overflowingRun.logicalWidth;
         if (result.action == InlineContentBreaker::Result::Action::Wrap)
-            return candidateRuns.first().logicalWidth;
+            return logicalWidthForNextLineAsLeading;
         if (result.action == InlineContentBreaker::Result::Action::Break && result.partialTrailingContent->partialRun)
-            return candidateRuns.first().logicalWidth - result.partialTrailingContent->partialRun->logicalWidth;
+            return logicalWidthForNextLineAsLeading - result.partialTrailingContent->partialRun->logicalWidth;
         return { };
     };