Changeset 284680 in webkit

Timestamp:

Oct 22, 2021, 7:31:05 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Add missing isAtSoftWrapOpportunity check when between two whitespace inline items
​https://bugs.webkit.org/show_bug.cgi?id=232055

Reviewed by Antti Koivisto.

Source/WebCore:

Due to the isWrappingAllowed checks in isAtSoftWrapOpportunity() to speed up line breaking,
we may end up with adjacent whitespace content with different wrapping styles (embedded in separate inline boxes).
e.g. <span style="white-space: no-wrap">XXX </span><span style="white-space: normal"> X</span

Test: fast/inline/white-space-nowrap-and-normal-inline-box.html

• layout/formattingContexts/inline/InlineContentBreaker.cpp:

(WebCore::Layout::isVisuallyEmptyWhitespaceContent):

• layout/formattingContexts/inline/InlineLineBuilder.cpp:

(WebCore::Layout::isAtSoftWrapOpportunity):

LayoutTests:

• fast/inline/white-space-nowrap-and-normal-inline-box-expected.html: Added.
• fast/inline/white-space-nowrap-and-normal-inline-box.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/white-space-nowrap-and-normal-inline-box-expected.html (added)
• LayoutTests/fast/inline/white-space-nowrap-and-normal-inline-box.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-22  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Add missing isAtSoftWrapOpportunity check when between two whitespace inline items
+        https://bugs.webkit.org/show_bug.cgi?id=232055
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/white-space-nowrap-and-normal-inline-box-expected.html: Added.
+        * fast/inline/white-space-nowrap-and-normal-inline-box.html: Added.
+
 2021-10-22  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-22  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Add missing isAtSoftWrapOpportunity check when between two whitespace inline items
+        https://bugs.webkit.org/show_bug.cgi?id=232055
+
+        Reviewed by Antti Koivisto.
+
+        Due to the isWrappingAllowed checks in isAtSoftWrapOpportunity() to speed up line breaking,
+        we may end up with adjacent whitespace content with different wrapping styles (embedded in separate inline boxes).
+        e.g. <span style="white-space: no-wrap">XXX </span><span style="white-space: normal"> X</span
+
+        Test: fast/inline/white-space-nowrap-and-normal-inline-box.html
+
+        * layout/formattingContexts/inline/InlineContentBreaker.cpp:
+        (WebCore::Layout::isVisuallyEmptyWhitespaceContent):
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::isAtSoftWrapOpportunity):
+
 2021-10-22  Alan Bujtas  <zalan@apple.com>
 

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

@@ -93 +93 @@
         auto& currentInlineTextItem = downcast<InlineTextItem>(current);
         auto& nextInlineTextItem = downcast<InlineTextItem>(next);
+        if (currentInlineTextItem.isWhitespace() && nextInlineTextItem.isWhitespace()) {
+            // <span> </span><span> </span>. Depending on the styles, there may or may not be a soft wrap opportunity between these 2 whitespace content.
+            return TextUtil::isWrappingAllowed(currentInlineTextItem.style()) || TextUtil::isWrappingAllowed(nextInlineTextItem.style());
+        }
         if (currentInlineTextItem.isWhitespace()) {
-            // [ ][text] : after [whitespace] position is a soft wrap opportunity.
+            // " <span>text</span>" : after [whitespace] position is a soft wrap opportunity.
             return TextUtil::isWrappingAllowed(currentInlineTextItem.style());
         }
         if (nextInlineTextItem.isWhitespace()) {
-            // [text][ ] (<span>text</span> )
+            // "<span>text</span> "
             // white-space: break-spaces: line breaking opportunity exists after every preserved white space character, but not before.
             return TextUtil::isWrappingAllowed(nextInlineTextItem.style()) && nextInlineTextItem.style().whiteSpace() != WhiteSpace::BreakSpaces;