Changeset 283481 in webkit

Timestamp:

Oct 3, 2021, 2:57:12 PM (5 years ago)

Author:

Alan Bujtas

Message:

Incorrect preferred width computation when trimmable leading whitespace is present
​https://bugs.webkit.org/show_bug.cgi?id=231139

Reviewed by Antti Koivisto.

Source/WebCore:

stripFrontSpaces should be reset to the default value whenever we are at the beginning of the line, while computing the preferred trimmed width.
This is already done for line break boxes (<br>) but not when the force line break comes from a text content with
preserved linebreak ("\n").

See WPT progressions.

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):

• rendering/RenderText.cpp:

(WebCore::RenderText::trimmedPreferredWidths):

• rendering/RenderText.h:

LayoutTests:

• TestExpectations: IFC already supports these cases. Preferred width computation produced an incorrect shrink-fit width.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderText.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderText.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-03  Alan Bujtas  <zalan@apple.com>
+
+        Incorrect preferred width computation when trimmable leading whitespace is present
+        https://bugs.webkit.org/show_bug.cgi?id=231139
+
+        Reviewed by Antti Koivisto.
+
+        * TestExpectations: IFC already supports these cases. Preferred width computation produced an incorrect shrink-fit width.
+
 2021-10-03  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -4443 +4443 @@
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-016.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-044.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/break-spaces-051.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/break-spaces-052.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-015.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-001.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/pre-wrap-051.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/pre-wrap-052.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/seg-break-transformation-018.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/seg-break-transformation-019.html [ ImageOnlyFailure ]
@@ -4458 +4454 @@
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-004.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/trailing-space-align-start.tentative.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/white-space-pre-051.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/white-space/white-space-pre-052.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/word-boundary/word-boundary-001.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/word-boundary/word-boundary-002.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-03  Alan Bujtas  <zalan@apple.com>
+
+        Incorrect preferred width computation when trimmable leading whitespace is present
+        https://bugs.webkit.org/show_bug.cgi?id=231139
+
+        Reviewed by Antti Koivisto.
+
+        stripFrontSpaces should be reset to the default value whenever we are at the beginning of the line, while computing the preferred trimmed width.
+        This is already done for line break boxes (<br>) but not when the force line break comes from a text content with
+        preserved linebreak ("\n").
+
+        See WPT progressions.
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::trimmedPreferredWidths):
+        * rendering/RenderText.h:
+
 2021-10-03  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -4552 +4552 @@
                     addedTextIndent = true;
                     addedStartPunctuationHang = true;
+                    if (widths.endsWithBreak)
+                        stripFrontSpaces = true;
+
                 } else
                     inlineMax += std::max<float>(0, childMax);

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -816 +816 @@
     widths.hasBreakableChar = m_hasBreakableChar;
     widths.hasBreak = m_hasBreak;
+    widths.endsWithBreak = m_hasBreak && text()[length - 1] == '\n';
 
     if (text()[0] == ' ' || (text()[0] == '\n' && !style.preserveNewline()) || text()[0] == '\t') {

trunk/Source/WebCore/rendering/RenderText.h

@@ -108 +108 @@
         bool hasBreakableChar { false };
         bool hasBreak { false };
+        bool endsWithBreak { false };
     };
     Widths trimmedPreferredWidths(float leadWidth, bool& stripFrontSpaces);