[css-text] Handling trailing ideographic spaces as regular spaces

The CSS Text 3 specification states on its 'Phase II: Trimming and Positioning' section: https://www.w3.org/TR/css-text-3/#white-space-phase-2 3- A sequence at the end of a line of collapsible spaces is removed, as well as any trailing U+1680 OGHAM SPACE MARK whose white-space property is normal, nowrap, or pre-line. 4- If there remains any sequence of white space and/or and/or other space separators, at the end of a line: If white-space is set to pre-wrap, the UA must hang this sequence. It may also visually collapse the character advance widths of any that would otherwise overflow. Summarizing, other space separator are not considered as collapsible spaces and should be hang, or broken in case of 'break-spaces', according to the value of the 'white-space' property. This CL tries to implement such behavior, since we were not considering this kind of spaces in the hanging/collapsing logic. For now this change affects LayoutNG only, but it'll be implemented for Legacy in a different CL. Bug: 972952 Change-Id: Idb0aff05f7f423f5b62f5169177c0240917435a7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1687411Reviewed-by: Koji Ishii <kojii@chromium.org> Commit-Queue: Javier Fernandez <jfernandez@igalia.com> Cr-Commit-Position: refs/heads/master@{#824597}

[css-text] Handling trailing ideographic spaces as regular spaces
The CSS Text 3 specification states on its 'Phase II: Trimming and Positioning' section: https://www.w3.org/TR/css-text-3/#white-space-phase-2 3- A sequence at the end of a line of collapsible spaces is removed, as well as any trailing U+1680 OGHAM SPACE MARK whose white-space property is normal, nowrap, or pre-line. 4- If there remains any sequence of white space and/or and/or other space separators, at the end of a line: If white-space is set to pre-wrap, the UA must hang this sequence. It may also visually collapse the character advance widths of any that would otherwise overflow. Summarizing, other space separator are not considered as collapsible spaces and should be hang, or broken in case of 'break-spaces', according to the value of the 'white-space' property. This CL tries to implement such behavior, since we were not considering this kind of spaces in the hanging/collapsing logic. For now this change affects LayoutNG only, but it'll be implemented for Legacy in a different CL. Bug: 972952 Change-Id: Idb0aff05f7f423f5b62f5169177c0240917435a7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1687411Reviewed-by: Koji Ishii <kojii@chromium.org> Commit-Queue: Javier Fernandez <jfernandez@igalia.com> Cr-Commit-Position: refs/heads/master@{#824597}
5c1b96e1 · Javier Fernández García-Boente · Commit Bot · f3d76072 · 5c1b96e1 · 5c1b96e1
Commit 5c1b96e1 authored Nov 05, 2020 by Javier Fernández García-Boente Committed by Commit Bot Nov 05, 2020
29 changed files
--- a/third_party/blink/renderer/core/layout/ng/inline/ng_line_breaker.cc
+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_line_breaker.cc
@@ -21,6 +21,7 @@
 #include "third_party/blink/renderer/core/style/computed_style.h"
 #include "third_party/blink/renderer/platform/fonts/shaping/shape_result_view.h"
 #include "third_party/blink/renderer/platform/fonts/shaping/shaping_line_breaker.h"
+#include "third_party/blink/renderer/platform/text/character.h"

 namespace blink {

@@ -34,6 +35,10 @@ inline bool IsBreakableSpace(UChar c) {
  return c == kSpaceCharacter || c == kTabulationCharacter;
 }

+inline bool IsBreakableSpaceOrOtherSeparator(UChar c) {
+  return IsBreakableSpace(c) || Character::IsOtherSpaceSeparator(c);
+}
+
 inline bool IsAllBreakableSpaces(const String& string,
                                 unsigned start,
                                 unsigned end) {
@@ -1183,7 +1188,8 @@ void NGLineBreaker::HandleTrailingSpaces(const NGInlineItem& item,
    return;
  }

-  if (style.CollapseWhiteSpace()) {
+  if (style.CollapseWhiteSpace() &&
+      !Character::IsOtherSpaceSeparator(text[offset_])) {
    if (text[offset_] != kSpaceCharacter) {
      if (offset_ > 0 && IsBreakableSpace(text[offset_ - 1]))
        trailing_whitespace_ = WhitespaceState::kCollapsible;
@@ -1203,12 +1209,14 @@ void NGLineBreaker::HandleTrailingSpaces(const NGInlineItem& item,
  } else if (style.WhiteSpace() != EWhiteSpace::kBreakSpaces) {
    // Find the end of the run of space characters in this item.
    // Other white space characters (e.g., tab) are not included in this item.
-    DCHECK(style.BreakOnlyAfterWhiteSpace());
+    DCHECK(style.BreakOnlyAfterWhiteSpace() ||
+           Character::IsOtherSpaceSeparator(text[offset_]));
    unsigned end = offset_;
-    while (end < item.EndOffset() && IsBreakableSpace(text[end]))
+    while (end < item.EndOffset() &&
+           IsBreakableSpaceOrOtherSeparator(text[end]))
      end++;
    if (end == offset_) {
-      if (IsBreakableSpace(text[end - 1]))
+      if (IsBreakableSpaceOrOtherSeparator(text[end - 1]))
        trailing_whitespace_ = WhitespaceState::kPreserved;
      state_ = LineBreakState::kDone;
      return;
@@ -1235,7 +1243,7 @@ void NGLineBreaker::HandleTrailingSpaces(const NGInlineItem& item,
    }
    position_ += item_result->inline_size;
    item_result->can_break_after =
-        end < text.length() && !IsBreakableSpace(text[end]);
+        end < text.length() && !IsBreakableSpaceOrOtherSeparator(text[end]);
    offset_ = end;
    trailing_whitespace_ = WhitespaceState::kPreserved;
  }

--- a/third_party/blink/renderer/platform/fonts/shaping/shaping_line_breaker.cc
+++ b/third_party/blink/renderer/platform/fonts/shaping/shaping_line_breaker.cc
@@ -41,12 +41,13 @@ inline float FlipRtl(float value, TextDirection direction) {
 }

 inline bool IsBreakableSpace(UChar ch) {
-  return LazyLineBreakIterator::IsBreakableSpace(ch);
+  return LazyLineBreakIterator::IsBreakableSpace(ch) ||
+         Character::IsOtherSpaceSeparator(ch);
 }

 bool IsAllSpaces(const String& text, unsigned start, unsigned end) {
  return StringView(text, start, end - start)
-      .IsAllSpecialCharacters<LazyLineBreakIterator::IsBreakableSpace>();
+      .IsAllSpecialCharacters<IsBreakableSpace>();
 }

 bool ShouldHyphenate(const String& text, unsigned start, unsigned end) {

--- a/third_party/blink/renderer/platform/text/character.h
+++ b/third_party/blink/renderer/platform/text/character.h
@@ -114,6 +114,9 @@ class PLATFORM_EXPORT Character {
    return c == kSpaceCharacter || c == kNewlineCharacter ||
           c == kTabulationCharacter || c == kCarriageReturnCharacter;
  }
+  static bool IsOtherSpaceSeparator(UChar c) {
+    return c == kIdeographicSpaceCharacter;
+  }
  static bool TreatAsSpace(UChar32 c) {
    return c == kSpaceCharacter || c == kTabulationCharacter ||
           c == kNewlineCharacter || c == kNoBreakSpaceCharacter;

--- a/third_party/blink/renderer/platform/wtf/text/character_names.h
+++ b/third_party/blink/renderer/platform/wtf/text/character_names.h
@@ -100,9 +100,7 @@ const UChar kHyphenCharacter = 0x2010;
 const UChar kHyphenMinusCharacter = 0x002D;
 const UChar kIdeographicCommaCharacter = 0x3001;
 const UChar kIdeographicFullStopCharacter = 0x3002;
-#if defined(USING_SYSTEM_ICU)
-const UChar ideographicSpaceCharacter = 0x3000;
-#endif
+const UChar kIdeographicSpaceCharacter = 0x3000;
 const UChar kInhibitArabicFormShapingCharacter = 0x206C;
 const UChar kInhibitSymmetricSwappingCharacter = 0x206A;
 const UChar kLatinCapitalLetterIWithDotAbove = 0x0130;
@@ -252,9 +250,7 @@ using WTF::unicode::kHyphenCharacter;
 using WTF::unicode::kHyphenMinusCharacter;
 using WTF::unicode::kIdeographicCommaCharacter;
 using WTF::unicode::kIdeographicFullStopCharacter;
-#if defined(USING_SYSTEM_ICU)
-using WTF::unicode::ideographicSpaceCharacter;
-#endif
+using WTF::unicode::kIdeographicSpaceCharacter;
 using WTF::unicode::kInhibitArabicFormShapingCharacter;
 using WTF::unicode::kInhibitSymmetricSwappingCharacter;
 using WTF::unicode::kLatinCapitalLetterIWithDotAbove;

--- a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng
+++ b/third_party/blink/web_tests/FlagExpectations/disable-layout-ng
@@ -221,9 +221,17 @@ crbug.com/591099 external/wpt/css/css-text/white-space/control-chars-00C.html [
 crbug.com/591099 external/wpt/css/css-text/white-space/line-edge-white-space-collapse-001.html [ Failure ]
 crbug.com/591099 external/wpt/css/css-text/white-space/line-edge-white-space-collapse-002.html [ Failure ]
 crbug.com/591099 external/wpt/css/css-text/white-space/pre-line-with-space-and-newline.html [ Failure ]
-crbug.com/591099 external/wpt/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-012.html [ Failure ]
-crbug.com/591099 external/wpt/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-013.html [ Failure ]
-crbug.com/591099 external/wpt/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-014.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-003.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-004.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-005.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-006.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-008.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-010.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-011.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-013.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-014.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-015.html [ Failure ]
+crbug.com/991413 external/wpt/css/css-text/white-space/trailing-ideographic-space-016.html [ Failure ]

 ### external/wpt/css/css-text/word-break/
 crbug.com/591099 external/wpt/css/css-text/word-break/word-break-break-all-004.html [ Failure ]

--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -1645,24 +1645,14 @@ crbug.com/1008029 external/wpt/css/css-text/white-space/textarea-pre-wrap-013.ht
 crbug.com/1071928 external/wpt/css/css-text/white-space/white-space-intrinsic-size-013.html [ Failure ]
 crbug.com/1071928 external/wpt/css/css-text/white-space/white-space-intrinsic-size-014.html [ Failure ]

-# Handling of trailing other spaces is not implemented yet.
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-001.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-002.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-003.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-004.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-001.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-002.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-003.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-005.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-006.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-007.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-008.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-010.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-011.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-012.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-014.html [ Skip ]
-crbug.com/991413 external/wpt/css/css-text/white-space/trailing-other-space-separators-break-spaces-015.html [ Skip ]
+# Handling of trailing other space separator
+crbug.com/1129834 external/wpt/css/css-text/white-space/trailing-other-space-separators-001.html [ Failure ]
+crbug.com/1129834 external/wpt/css/css-text/white-space/trailing-other-space-separators-002.html [ Failure ]
+crbug.com/1129834 external/wpt/css/css-text/white-space/trailing-other-space-separators-003.html [ Failure ]
+crbug.com/1129834 external/wpt/css/css-text/white-space/trailing-other-space-separators-004.html [ Failure ]
+crbug.com/972992 external/wpt/css/css-text/white-space/trailing-ideographic-space-001.html [ Failure ]
+crbug.com/972992 external/wpt/css/css-text/white-space/trailing-ideographic-space-002.html [ Failure ]
+

 # Follow up the spec change for U+2010, U+2013
 crbug.com/1052717 external/wpt/css/css-text/line-break/line-break-loose-hyphens-001.html [ Failure ]
@@ -2895,15 +2885,11 @@ crbug.com/626703 external/wpt/html/browsers/the-window-object/apis-for-creating-
 crbug.com/626703 external/wpt/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html [ Timeout ]
 crbug.com/626703 external/wpt/css/css-text/letter-spacing/letter-spacing-bidi-002.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-text/letter-spacing/letter-spacing-nesting-002.html [ Failure ]
-crbug.com/626703 external/wpt/css/css-text/white-space/trailing-ideographic-space-001.html [ Failure ]
-crbug.com/626703 external/wpt/css/css-text/white-space/trailing-ideographic-space-003.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-text/letter-spacing/letter-spacing-nesting-001.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-text/letter-spacing/letter-spacing-bidi-001.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-text/letter-spacing/letter-spacing-end-of-line-001.html [ Failure ]
 crbug.com/626703 external/wpt/mediacapture-record/MediaRecorder-destroy-script-execution.html [ Timeout ]
 crbug.com/626703 external/wpt/mediacapture-record/MediaRecorder-no-sink.https.html [ Timeout ]
-crbug.com/626703 external/wpt/css/css-text/white-space/trailing-ideographic-space-002.html [ Failure ]
-crbug.com/626703 external/wpt/css/css-text/white-space/trailing-ideographic-space-004.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-will-change/will-change-abspos-cb-dynamic-001.html [ Failure ]
 crbug.com/626703 external/wpt/css/css-will-change/will-change-abspos-cb-001.html [ Failure ]
 ### See crbug.com/891427 comment near the top of this file:

--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-001.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-001.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/full-width-leading-spaces-001-ref.html">
+<meta name="assert" content="An ideographic space (U+3000) sequence at the beginning of the line must not be collapsed.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div { font: 20px/1 Ahem; }
+.test {
+    width: 5em;
+    color: green;
+    background: green;
+}
+.ref {
+    position: absolute;
+    z-index: -1;
+    color: red;
+}
+</style>
+
+<p>Test passes if the characters below are arranged in a green rectangle and if there is no red.
+<div class="ref">XXXXX</div>
+<div class="test">&#x3000;&#x3000;&#x3000;XX</div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-002.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-002.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="An ideographic space (U+3000) sequence at the beginning of the line must not be collapsed.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div { font: 50px/1 Ahem; }
+.test {
+    width: 2em;
+    color: green;
+    background: green;
+}
+.ref {
+    position: absolute;
+    z-index: -1;
+    color: red;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div class="test">&#x3000;&#x3000;XX</div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-003.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-003.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="An ideographic space (U+3000) sequence at the beginning of the line must not be collapsed.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div { font: 50px/1 Ahem; }
+.test {
+    width: 2em;
+    color: green;
+    background: green;
+}
+.ref {
+    position: absolute;
+    z-index: -1;
+    color: red;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div class="test">&#x3000;&#x3000;XX</div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-004.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-004.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="Leading ideographic space sequences must account for intrinsic size.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+.ref {
+    width: 100px;
+    height: 100px;
+    background: red;
+}
+.test {
+    width: min-content;
+    font-size: 100px;
+    line-height: 1;
+    background: green;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref"><div class="test">&#x03000;</div></div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-005.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/full-width-leading-spaces-005.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/white-space-break-spaces-005-ref.html">
+<meta name="assert" content="There is a breaking opportunity at the end of a leading ideographic space (U+3000) sequence.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div { font: 50px/1 Ahem; }
+.test {
+    width: 2em;
+    color: green;
+    background: green;
+}
+.ref {
+    position: absolute;
+    z-index: -1;
+    color: red;
+}
+</style>
+
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div class="ref">XX<br>XX</div>
+<div class="test">&#x3000;&#x3000;XX</div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/full-width-leading-spaces-001-ref.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/full-width-leading-spaces-001-ref.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<p>Test passes if the characters below are arranged in a green rectangle and if there is no red.
+<div style="width: 100px; height: 20px; background: green"></div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/trailing-ideographic-space-011-ref.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/trailing-ideographic-space-011-ref.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 20px/1 Ahem;
+    white-space: pre;
+}
+span { background: blue; }
+</style>
+
+<p>Test passes if the characters below are arranged in a single line and if there is a blue square at the end of the first line.
+<div>X X<span> </span></div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/trailing-ideographic-space-alt-011-ref.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/trailing-ideographic-space-alt-011-ref.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div { font: 20px/1 Ahem; }
+</style>
+
+<p>Test passes if the characters below are arranged in a square and if there is a blue rectangle at the end of the first line.
+<div>X X<span>X</span></div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html
@@ -9,6 +9,7 @@ div {
  font: 25px/1 Ahem;
  color: green;
 }
+span { color: blue; }
 </style>

 <p>This test passes if there is a green square and no red.

--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html
+<!doctype html>
+<meta charset=utf-8>
+<title>CSS test Reference</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
+
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 25px/1 Ahem;
+  color: green;
+}
+span { color: blue; }
+</style>
+
+<p>This test passes if there is a green square and no red.
+
+<div>XX<span>X</span><br>XX</div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-005.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-005.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: sequences of spaces and ideographic spaces at the end of line must hang</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="match" href="reference/trailing-ideographic-space-004-ref.html">
+<link rel="match" href="reference/trailing-ideographic-space-alt-003-ref.html">
+<meta name="assert" content="An sequence ideographic space (U+3000) and regular spaces at the end of the line must hang unconditionally .">
+<style>
+div {
+  width: 2.5em;
+  white-space: normal;
+}
+span { background: blue; } /* If the spaces are removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>Test passes if the characters below are arranged in a square and if there is a blue rectangle at the end of the first line.
+<div>ああ<span>&#x3000;&#x3000; &#x3000; &#x3000;</span>ああ</div>
+
+<!--
+We're using a 2.5em width and two references, instead of 2em and just the first one,
+because in addition to requiring the spaces to hang,
+the spec allows, but does not require, browsers to visually collapse the advance widths of characters that overflow.
+In browsers that don't do that, the whole space will be visible, and the first ref will be matched.
+In browsers that do, only the first 0.5em worth of space will be preserved, and the second ref will match.
+-->
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-006.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-006.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: sequences of spaces and ideographic spaces at the end of line must hang</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-normal">
+<link rel="match" href="reference/trailing-ideographic-space-003-ref.html">
+<link rel="match" href="reference/trailing-ideographic-space-alt-003-ref.html">
+<meta name="assert" content="An ideographic space (U+3000) at the end of the line must unconditionally hang.">
+<style>
+div {
+  width: 2.5em;
+  white-space: normal;
+}
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>Test passes if the characters below are arranged in a square and if there is a blue rectangle at the end of the first line.
+<div>ああ<span>&#x3000;</span>ああ</div>
+
+<!--
+We're using a 2.5em width and two references, instead of 2em and just the first one,
+because in addition to requiring the spaces to hang,
+the spec allows, but does not require, browsers to visually collapse the advance widths of characters that overflow.
+In browsers that don't do that, the whole sequence of preserved spaces will be visible, and the first ref will be matched.
+In browsers that do, only the first 0.5em worth of space will be preserved, and the second ref will match.
+-->
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-007.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-007.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: sequences of spaces and ideographic spaces at the end of line must hang</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-nowrap">
+<link rel="match" href="reference/trailing-ideographic-space-003-ref.html">
+<link rel="match" href="reference/trailing-ideographic-space-alt-003-ref.html">
+<meta name="assert" content="An ideographic space (U+3000) at the end of the line must unconditionally hang.">
+<style>
+div {
+  width: 2.5em;
+  white-space: nowrap;
+}
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>Test passes if the characters below are arranged in a square and if there is a blue rectangle at the end of the first line.
+<div>ああ<span>&#x3000;</span><br>ああ</div>
+
+<!--
+We're using a 2.5em width and two references, instead of 2em and just the first one,
+because in addition to requiring the spaces to hang,
+the spec allows, but does not require, browsers to visually collapse the advance widths of characters that overflow.
+In browsers that don't do that, the whole sequence of preserved spaces will be visible, and the first ref will be matched.
+In browsers that do, only the first 0.5em worth of space will be preserved, and the second ref will match.
+-->
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-008.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-008.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: sequences of spaces and ideographic spaces at the end of line must hang</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-line">
+<link rel="match" href="reference/trailing-ideographic-space-003-ref.html">
+<link rel="match" href="reference/trailing-ideographic-space-alt-003-ref.html">
+<meta name="assert" content="An ideographic space (U+3000) at the end of the line must unconditionally hang.">
+<style>
+div {
+  width: 2.5em;
+  white-space: pre-line;
+}
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>Test passes if the characters below are arranged in a square and if there is a blue rectangle at the end of the first line.
+<div>ああ<span>&#x3000;</span>ああ</div>
+
+<!--
+We're using a 2.5em width and two references, instead of 2em and just the first one,
+because in addition to requiring the spaces to hang,
+the spec allows, but does not require, browsers to visually collapse the advance widths of characters that overflow.
+In browsers that don't do that, the whole sequence of preserved spaces will be visible, and the first ref will be matched.
+In browsers that do, only the first 0.5em worth of space will be preserved, and the second ref will match.
+-->
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-009.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-009.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: sequences of spaces and ideographic spaces at the end of line must hang</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-nowrap">
+<link rel="match" href="reference/trailing-ideographic-space-004-ref.html">
+<link rel="match" href="reference/trailing-ideographic-space-alt-003-ref.html">
+<meta name="assert" content="An sequence ideographic space (U+3000) and regular spaces at the end of the line must hang unconditionally .">
+<style>
+div {
+  width: 2.5em;
+  white-space: nowrap;
+}
+span { background: blue; } /* If the spaces are removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>Test passes if the characters below are arranged in a square and if there is a blue rectangle at the end of the first line.
+<div>ああ<span>&#x3000;&#x3000; &#x3000; &#x3000;</span><br>ああ</div>
+
+<!--
+We're using a 2.5em width and two references, instead of 2em and just the first one,
+because in addition to requiring the spaces to hang,
+the spec allows, but does not require, browsers to visually collapse the advance widths of characters that overflow.
+In browsers that don't do that, the whole space will be visible, and the first ref will be matched.
+In browsers that do, only the first 0.5em worth of space will be preserved, and the second ref will match.
+-->
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-010.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-010.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: sequence of ideographic spaces at the end of line must hang</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com"
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-line">
+<link rel="match" href="reference/trailing-ideographic-space-004-ref.html">
+<link rel="match" href="reference/trailing-ideographic-space-alt-003-ref.html">
+<meta name="assert" content="An sequence ideographic space (U+3000) and regular spaces at the end of the line must hang unconditionally .">
+<style>
+div {
+  width: 2.5em;
+  white-space: pre-line;
+}
+span { background: blue; } /* If the spaces are removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>Test passes if the characters below are arranged in a square and if there is a blue rectangle at the end of the first line.
+<div>ああ<span>&#x3000;&#x3000; &#x3000; &#x3000;</span>ああ</div>
+
+<!--
+We're using a 2.5em width and two references, instead of 2em and just the first one,
+because in addition to requiring the spaces to hang,
+the spec allows, but does not require, browsers to visually collapse the advance widths of characters that overflow.
+In browsers that don't do that, the whole space will be visible, and the first ref will be matched.
+In browsers that do, only the first 0.5em worth of space will be preserved, and the second ref will match.
+-->
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-011.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-011.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-wrap">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/trailing-ideographic-space-011-ref.html">
+<link rel="match" href="reference/trailing-ideographic-space-alt-011-ref.html">
+<meta name="assert" content="Trailing ideographic spaces should hang.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 20px/1 Ahem;
+    width: 3ch;
+}
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>Test passes if the characters below are arranged in a single line and if there is a blue square at the end of the first line.
+<div>X&#x03000;<span>X&#x03000;</span></div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-012.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-012.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-wrap">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/white-space-pre-wrap-trailing-spaces-004-ref.html">
+<link rel="match" href="reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html">
+<meta name="assert" content="Trailing ideographic spaces should hang.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+  font: 25px/1 Ahem;
+  color: green;
+  background: red;
+
+  width: 2ch;
+}
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>This test passes if there is a green square and no red.
+<div>XX<span>&#x03000;</span>XX</div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-013.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-013.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-wrap">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-break-word">
+<link rel="match" href="reference/white-space-pre-wrap-trailing-spaces-004-ref.html">
+<link rel="match" href="reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html">
+<meta name="assert" content="Trailing ideographic spaces should hang, despite the use of overflow-wrap: break-word.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+  font: 25px/1 Ahem;
+  color: green;
+  background: red;
+
+  width: 2ch;
+  overflow-wrap: break-word;
+}
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>This test passes if there is a green square and no red.
+<div>XX<span>&#x03000;</span>XX</div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-014.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-014.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-wrap">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/white-space-pre-wrap-trailing-spaces-004-ref.html">
+<link rel="match" href="reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html">
+<meta name="assert" content="Trailing ideographic spaces should hang, despite the use of overflow-wrap: anywhere.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+  font: 25px/1 Ahem;
+  color: green;
+  background: red;
+
+  width: 2ch;
+  overflow-wrap: anywhere;
+}
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>This test passes if there is a green square and no red.
+<div>XX<span>&#x03000;</span>XX</div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-015.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-015.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-wrap">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/trailing-ideographic-space-011-ref.html">
+<link rel="match" href="reference/trailing-ideographic-space-alt-011-ref.html">
+<meta name="assert" content="Trailing ideographic spaces should hang, despite the use of overflow-wrap: anywhere.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 20px/1 Ahem;
+    width: 3ch;
+
+    overflow-wrap: anywhere;
+}
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>Test passes if the characters below are arranged in a single line and if there is a blue square at the end of the first line.
+<div>X&#x03000;<span>X&#x03000;</span></div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-016.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/trailing-ideographic-space-016.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" title="3. White Space and Wrapping: the white-space property" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-wrap">
+<link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" title="5.5. Overflow Wrapping: the overflow-wrap/word-wrap property" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-overflow-wrap-anywhere">
+<link rel="match" href="reference/trailing-ideographic-space-011-ref.html">
+<link rel="match" href="reference/trailing-ideographic-space-alt-011-ref.html">
+<meta name="assert" content="Trailing ideographic spaces should hang, despite the use of overflow-wrap: break-word.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+div {
+    font: 20px/1 Ahem;
+    width: 3ch;
+
+    overflow-wrap: break-word;
+}
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
+</style>
+
+<p>Test passes if the characters below are arranged in a single line and if there is a blue square at the end of the first line.
+<div>X&#x03000;<span>X&#x03000;</span></div>
--- a/third_party/blink/web_tests/external/wpt/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-004.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-004.html
@@ -6,6 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-wrap">
 <link rel="help" title="4.1.3. Phase II: Trimming and Positioning" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
 <link rel="match" href="reference/white-space-pre-wrap-trailing-spaces-004-ref.html">
+<link rel="match" href="reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html">
 <meta name="assert" content="Preserved white space at the end of a soft-wrapped line is hanged when white-space is pre-wrap.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
@@ -17,6 +18,7 @@ div {
  width: 2ch;
  white-space: pre-wrap;
 }
+span { background: blue; } /* If the space is removed instead of hanging, there will be no blue box*/
 </style>

 <p>This test passes if there is a green square and no red.