Replace CR/NL by space - don't remove altogether when xml:space=default

third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp

 /*
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  * Copyright (C) 2006 Apple Computer Inc.
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2008 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 22 matching lines @@
 #include "core/layout/svg/line/SVGInlineTextBox.h"
 #include "platform/fonts/CharacterRange.h"
 #include "platform/text/BidiCharacterRun.h"
 #include "platform/text/BidiResolver.h"
 #include "platform/text/TextDirection.h"
 #include "platform/text/TextRun.h"
 #include "platform/text/TextRunIterator.h"
 
 namespace blink {
 
-static PassRefPtr<StringImpl> applySVGWhitespaceRules(PassRefPtr<StringImpl> string, bool preserveWhiteSpace)
+// Turn tabs, newlines and carriage returns into spaces. In the future this
+// should be removed in favor of letting the generic white-space code handle
+// this.
+static PassRefPtr<StringImpl> normalizeWhitespace(PassRefPtr<StringImpl> string)
 {
-    if (preserveWhiteSpace) {
-        // Spec: When xml:space="preserve", the SVG user agent will do the following using a
-        // copy of the original character data content. It will convert all newline and tab
-        // characters into space characters. Then, it will draw all space characters, including
-        // leading, trailing and multiple contiguous space characters.
-        RefPtr<StringImpl> newString = string->replace('\t', ' ');
-        newString = newString->replace('\n', ' ');
-        newString = newString->replace('\r', ' ');
-        return newString.release();
-    }
-
-    // Spec: When xml:space="default", the SVG user agent will do the following using a
-    // copy of the original character data content. First, it will remove all newline
-    // characters. Then it will convert all tab characters into space characters.
-    // Then, it will strip off all leading and trailing space characters.
-    // Then, all contiguous space characters will be consolidated.
-    RefPtr<StringImpl> newString = string->replace('\n', StringImpl::empty());
-    newString = newString->replace('\r', StringImpl::empty());
-    newString = newString->replace('\t', ' ');
+    RefPtr<StringImpl> newString = string->replace('\t', ' ');
+    newString = newString->replace('\n', ' ');
+    newString = newString->replace('\r', ' ');
     return newString.release();
 }
 
 LayoutSVGInlineText::LayoutSVGInlineText(Node* n, PassRefPtr<StringImpl> string)
-    : LayoutText(n, applySVGWhitespaceRules(string, false))
+    : LayoutText(n, normalizeWhitespace(string))
     , m_scalingFactor(1)
     , m_layoutAttributes(this)
 {
 }
 
 void LayoutSVGInlineText::setTextInternal(PassRefPtr<StringImpl> text)
 {
     LayoutText::setTextInternal(text);
     if (LayoutSVGText* textLayoutObject = LayoutSVGText::locateLayoutSVGTextAncestor(this))
         textLayoutObject->subtreeTextDidChange();
@@ skipping 393 matching lines @@
 FloatRect LayoutSVGInlineText::paintInvalidationRectInLocalSVGCoordinates() const
 {
     return parent()->paintInvalidationRectInLocalSVGCoordinates();
 }
 
 PassRefPtr<StringImpl> LayoutSVGInlineText::originalText() const
 {
     RefPtr<StringImpl> result = LayoutText::originalText();
     if (!result)
         return nullptr;
-    return applySVGWhitespaceRules(result, style() && style()->whiteSpace() == PRE);
+    return normalizeWhitespace(result);
 }
 
 } // namespace blink