Changeset 283493 in webkit

Timestamp:

Oct 4, 2021 6:16:56 AM (10 months ago)

Author:

Alan Bujtas

Message:

'overflow-wrap: anywhere' should be considered when calculating min-content intrinsic sizes.
​https://bugs.webkit.org/show_bug.cgi?id=231152

Reviewed by Javier Fernandez.

Source/WebCore:

As opposed to overflow-wrap: 'break-word', 'anywhere' should be taken into account when computing the preferred width.

"An otherwise unbreakable sequence of characters may be broken at an arbitrary point...
Soft wrap opportunities introduced by anywhere are considered when calculating min-content intrinsic sizes."

​https://drafts.csswg.org/css-text-3/#overflow-wrap-property

• rendering/RenderText.cpp:

(WebCore::RenderText::computePreferredLogicalWidths):
(WebCore::RenderText::computeCanUseSimplifiedTextMeasuring const):

LayoutTests:

• TestExpectations: Progressions.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-04  Alan Bujtas  <zalan@apple.com>
+
+        'overflow-wrap: anywhere' should be considered when calculating min-content intrinsic sizes.
+        https://bugs.webkit.org/show_bug.cgi?id=231152
+
+        Reviewed by Javier Fernandez.
+
+        * TestExpectations: Progressions.
+
 2021-10-04  Ziran Sun  <zsun@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -2643 +2643 @@
 # overflow-wrap:anywhere feature is not implemented in legacy line layout.
 webkit.org/b/195345 imported/w3c/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-003.html [ ImageOnlyFailure ]
-webkit.org/b/195345 imported/w3c/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html [ ImageOnlyFailure ]
 webkit.org/b/195345 imported/w3c/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html [ ImageOnlyFailure ]
-webkit.org/b/195345 imported/w3c/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html [ ImageOnlyFailure ]
 webkit.org/b/195345 imported/w3c/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-006.html [ ImageOnlyFailure ]
 
@@ -4392 +4390 @@
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-016.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-017.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-005.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-007.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-normal-keep-all-001.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-shaping-001.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-04  Alan Bujtas  <zalan@apple.com>
+
+        'overflow-wrap: anywhere' should be considered when calculating min-content intrinsic sizes.
+        https://bugs.webkit.org/show_bug.cgi?id=231152
+
+        Reviewed by Javier Fernandez.
+
+        As opposed to overflow-wrap: 'break-word', 'anywhere' should be taken into account when computing the preferred width.
+
+        "An otherwise unbreakable sequence of characters may be broken at an arbitrary point... 
+        Soft wrap opportunities introduced by anywhere are considered when calculating min-content intrinsic sizes."
+
+        https://drafts.csswg.org/css-text-3/#overflow-wrap-property
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::computePreferredLogicalWidths):
+        (WebCore::RenderText::computeCanUseSimplifiedTextMeasuring const):
+
 2021-10-04  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1015 +1015 @@
     bool breakNBSP = style.autoWrap() && style.nbspMode() == NBSPMode::Space;
     
-    // Note the deliberate omission of word-wrap and overflow-wrap from this breakAll check. Those
-    // do not affect minimum preferred sizes. Note that break-word is a non-standard value for
+    bool breakAnywhere = style.lineBreak() == LineBreak::Anywhere && style.autoWrap();
+    // Note the deliberate omission of word-wrap/overflow-wrap's break-word value from this breakAll check.
+    // Those do not affect minimum preferred sizes. Note that break-word is a non-standard value for
     // word-break, but we support it as though it means break-all.
-    bool breakAnywhere = style.lineBreak() == LineBreak::Anywhere && style.autoWrap();
-    bool breakAll = (style.wordBreak() == WordBreak::BreakAll || style.wordBreak() == WordBreak::BreakWord) && style.autoWrap();
+    bool breakAll = (style.wordBreak() == WordBreak::BreakAll || style.wordBreak() == WordBreak::BreakWord || style.overflowWrap() == OverflowWrap::Anywhere) && style.autoWrap();
     bool keepAllWords = style.wordBreak() == WordBreak::KeepAll;
     bool canUseLineBreakShortcut = iteratorMode == LineBreakIteratorMode::Default;