Handle word-spacing for leading white space on SVG text

SVGTextLayoutEngineSpacing checking if the current and last characters were non-nuls before attempting to apply word-spacing. This would mean that we'd never add word-spacing at the beginning of a text box. Remove the checks for non-nuls. Bug: 902839 Change-Id: I751e1bd1317f7411960d137b7e55a3b83e8cb0df Reviewed-on: https://chromium-review.googlesource.com/c/1326156Reviewed-by: Stephen Chenney <schenney@chromium.org> Commit-Queue: Fredrik Söderquist <fs@opera.com> Cr-Commit-Position: refs/heads/master@{#606528}

Handle word-spacing for leading white space on SVG text
SVGTextLayoutEngineSpacing checking if the current and last characters were non-nuls before attempting to apply word-spacing. This would mean that we'd never add word-spacing at the beginning of a text box. Remove the checks for non-nuls. Bug: 902839 Change-Id: I751e1bd1317f7411960d137b7e55a3b83e8cb0df Reviewed-on: https://chromium-review.googlesource.com/c/1326156Reviewed-by: Stephen Chenney <schenney@chromium.org> Commit-Queue: Fredrik Söderquist <fs@opera.com> Cr-Commit-Position: refs/heads/master@{#606528}
56aec4bd · Fredrik Söderquist · Commit Bot · b01bada3 · 56aec4bd · 56aec4bd
Commit 56aec4bd authored Nov 08, 2018 by Fredrik Söderquist Committed by Commit Bot Nov 08, 2018
3 changed files
--- a/third_party/WebKit/LayoutTests/svg/text/word-spacing-leading-ws-expected.html
+++ b/third_party/WebKit/LayoutTests/svg/text/word-spacing-leading-ws-expected.html
+<!DOCTYPE html>
+<div style="width: 100px; height: 100px; background-color: green"></div>
--- a/third_party/WebKit/LayoutTests/svg/text/word-spacing-leading-ws.html
+++ b/third_party/WebKit/LayoutTests/svg/text/word-spacing-leading-ws.html
+<!DOCTYPE html>
+<script src="../../resources/ahem.js"></script>
+<svg>
+  <rect width="100" height="100" fill="red"/>
+  <g fill="green" style="font-size: 50px; font-family: Ahem; word-spacing: 50px">
+    <text x="-100" y="40" style="white-space: pre"> XX</text>
+    <text x="-100" y="90" style="white-space: pre"><tspan> XX</tspan></text>
+  </g>
+</svg>
--- a/third_party/blink/renderer/core/layout/svg/svg_text_layout_engine_spacing.cc
+++ b/third_party/blink/renderer/core/layout/svg/svg_text_layout_engine_spacing.cc
@@ -39,8 +39,7 @@ float SVGTextLayoutEngineSpacing::CalculateCSSSpacing(UChar current_character) {
    return 0;

  float spacing = font_.GetFontDescription().LetterSpacing();
-  if (current_character && last_character &&
-      font_.GetFontDescription().WordSpacing()) {
+  if (font_.GetFontDescription().WordSpacing()) {
    if (Character::TreatAsSpace(current_character) &&
        !Character::TreatAsSpace(last_character))
      spacing += font_.GetFontDescription().WordSpacing();