[SVG2] Allow leading and trailing whitespace in svg attributes

Source/core/svg/SVGParserUtilities.h

 /*
  * Copyright (C) 2002, 2003 The Karbon Developers
  * Copyright (C) 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2013 Apple Inc. 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 17 matching lines @@
 
 typedef pair<unsigned, unsigned> UnicodeRange;
 typedef Vector<UnicodeRange> UnicodeRanges;
 
 namespace WebCore {
 
 class FloatPoint;
 class FloatRect;
 class SVGPointList;
 
+enum WhitespaceParsing {
+    STRICT = 0,
+    ALLOW_LEADING = 0x1,
+    ALLOW_TRAILING = 0x2,
+    ALLOW_LEADING_AND_TRAILING = ALLOW_LEADING | ALLOW_TRAILING
+};
+
 template <typename CharType>
 bool parseSVGNumber(CharType* ptr, size_t length, double& number);
-bool parseNumber(const LChar*& ptr, const LChar* end, float& number, bool skip = true);
-bool parseNumber(const UChar*& ptr, const UChar* end, float& number, bool skip = true);
+bool parseNumber(const LChar*& ptr, const LChar* end, float& number, WhitespaceParsing mode = ALLOW_LEADING_AND_TRAILING);
+bool parseNumber(const UChar*& ptr, const UChar* end, float& number, WhitespaceParsing mode = ALLOW_LEADING_AND_TRAILING);
 bool parseNumberOptionalNumber(const String& s, float& h, float& v);
+bool parseNumberOrPercentage(const String& s, float& number);
 bool parseArcFlag(const LChar*& ptr, const LChar* end, bool& flag);
 bool parseArcFlag(const UChar*& ptr, const UChar* end, bool& flag);
 
 template <typename CharType>
 bool parseFloatPoint(const CharType*& current, const CharType* end, FloatPoint&);
 template <typename CharType>
 bool parseFloatPoint2(const CharType*& current, const CharType* end, FloatPoint&, FloatPoint&);
 template <typename CharType>
 bool parseFloatPoint3(const CharType*& current, const CharType* end, FloatPoint&, FloatPoint&, FloatPoint&);
 
 // SVG allows several different whitespace characters:
 // http://www.w3.org/TR/SVG/paths.html#PathDataBNF
 template <typename CharType>
 inline bool isSVGSpace(CharType c)
 {
-    return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+    return c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f';

[pdr., 2014/06/02 14:35:19]

This now matches isHTMLSpace(). Do we need both?

[Erik Dahlström (inactive), 2014/06/04 16:25:43]

Replaced all instances of isSVGSpace with isHTMLSpace.

 }
 
 template <typename CharType>
 inline bool skipOptionalSVGSpaces(const CharType*& ptr, const CharType* end)
 {
     while (ptr < end && isSVGSpace(*ptr))
         ptr++;
     return ptr < end;
 }
 
@@ skipping 15 matching lines @@
 bool parseKerningUnicodeString(const String& input, UnicodeRanges&, HashSet<String>& stringList);
 bool parseGlyphName(const String& input, HashSet<String>& values);
 
 template<typename CharType>
 bool parseAndSkipTransformType(const CharType*& ptr, const CharType* end, SVGTransformType&);
 SVGTransformType parseTransformType(const String&);
 
 } // namespace WebCore
 
 #endif // SVGParserUtilities_h