[SVG2] Allow leading and trailing whitespace in svg attributes

Source/core/svg/SVGParserUtilities.cpp

 /*
  * Copyright (C) 2002, 2003 The Karbon Developers
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007, 2009, 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 25 matching lines @@
 static inline bool isValidRange(const FloatType& x)
 {
     static const FloatType max = std::numeric_limits<FloatType>::max();
     return x >= -max && x <= max;
 }
 
 // We use this generic parseNumber function to allow the Path parsing code to work
 // at a higher precision internally, without any unnecessary runtime cost or code
 // complexity.
 template <typename CharType, typename FloatType>
-static bool genericParseNumber(const CharType*& ptr, const CharType* end, FloatType& number, bool skip)
+static bool genericParseNumber(const CharType*& ptr, const CharType* end, FloatType& number, WhitespaceMode mode)
 {
     FloatType integer, decimal, frac, exponent;
     int sign, expsign;
     const CharType* start = ptr;
 
     exponent = 0;
     integer = 0;
     frac = 1;
     decimal = 0;
     sign = 1;
     expsign = 1;
 
+    if (mode & AllowLeadingWhitespace)
+        skipOptionalSVGSpaces(ptr, end);
+
     // read the sign
     if (ptr < end && *ptr == '+')
         ptr++;
     else if (ptr < end && *ptr == '-') {
         ptr++;
         sign = -1;
     }
 
     if (ptr == end || ((*ptr < '0' || *ptr > '9') && *ptr != '.'))
         // The first character of a number must be one of [0-9+-.]
@@ skipping 60 matching lines @@
     if (exponent)
         number *= static_cast<FloatType>(pow(10.0, expsign * static_cast<int>(exponent)));
 
     // Don't return Infinity() or NaN().
     if (!isValidRange(number))
         return false;
 
     if (start == ptr)
         return false;
 
-    if (skip)
+    if (mode & AllowTrailingWhitespace)
         skipOptionalSVGSpacesOrDelimiter(ptr, end);
 
     return true;
 }
 
 template <typename CharType>
 bool parseSVGNumber(CharType* begin, size_t length, double& number)
 {
     const CharType* ptr = begin;
     const CharType* end = ptr + length;
-    return genericParseNumber(ptr, end, number, false);
+    return genericParseNumber(ptr, end, number, AllowLeadingAndTrailingWhitespace);
 }
 
 // Explicitly instantiate the two flavors of parseSVGNumber() to satisfy external callers
 template bool parseSVGNumber(LChar* begin, size_t length, double&);
 template bool parseSVGNumber(UChar* begin, size_t length, double&);
 
-bool parseNumber(const LChar*& ptr, const LChar* end, float& number, bool skip)
+bool parseNumber(const LChar*& ptr, const LChar* end, float& number, WhitespaceMode mode)
 {
-    return genericParseNumber(ptr, end, number, skip);
+    return genericParseNumber(ptr, end, number, mode);
 }
 
-bool parseNumber(const UChar*& ptr, const UChar* end, float& number, bool skip)
+bool parseNumber(const UChar*& ptr, const UChar* end, float& number, WhitespaceMode mode)
 {
-    return genericParseNumber(ptr, end, number, skip);
+    return genericParseNumber(ptr, end, number, mode);
 }
 
 // only used to parse largeArcFlag and sweepFlag which must be a "0" or "1"
 // and might not have any whitespace/comma after it
 template <typename CharType>
 bool genericParseArcFlag(const CharType*& ptr, const CharType* end, bool& flag)
 {
     if (ptr >= end)
         return false;
     const CharType flagChar = *ptr++;
@@ skipping 20 matching lines @@
 }
 
 template<typename CharType>
 static bool genericParseNumberOptionalNumber(const CharType*& ptr, const CharType* end, float& x, float& y)
 {
     if (!parseNumber(ptr, end, x))
         return false;
 
     if (ptr == end)
         y = x;
-    else if (!parseNumber(ptr, end, y, false))
+    else if (!parseNumber(ptr, end, y, AllowLeadingAndTrailingWhitespace))
         return false;
 
     return ptr == end;
 }
 
 bool parseNumberOptionalNumber(const String& string, float& x, float& y)
 {
     if (string.isEmpty())
         return false;
+
     if (string.is8Bit()) {
         const LChar* ptr = string.characters8();
         const LChar* end = ptr + string.length();
         return genericParseNumberOptionalNumber(ptr, end, x, y);
     }
     const UChar* ptr = string.characters16();
     const UChar* end = ptr + string.length();
     return genericParseNumberOptionalNumber(ptr, end, x, y);
 }
 
 template<typename CharType>
+bool genericParseNumberOrPercentage(const CharType*& ptr, const CharType* end, float& number)
+{
+    if (genericParseNumber(ptr, end, number, AllowLeadingWhitespace)) {
+        if (ptr == end)
+            return true;
+
+        bool isPercentage = (*ptr == '%');
+        if (isPercentage)
+            ptr++;
+
+        skipOptionalSVGSpaces(ptr, end);
+
+        if (isPercentage)
+            number /= 100.f;
+
+        return ptr == end;
+    }
+
+    return false;
+}
+
+bool parseNumberOrPercentage(const String& string, float& number)
+{
+    if (string.isEmpty())
+        return false;
+
+    if (string.is8Bit()) {
+        const LChar* ptr = string.characters8();
+        const LChar* end = ptr + string.length();
+        return genericParseNumberOrPercentage(ptr, end, number);
+    }
+    const UChar* ptr = string.characters16();
+    const UChar* end = ptr + string.length();
+    return genericParseNumberOrPercentage(ptr, end, number);
+}
+
+template<typename CharType>
 static bool parseGlyphName(const CharType*& ptr, const CharType* end, HashSet<String>& values)
 {
     skipOptionalSVGSpaces(ptr, end);
 
     while (ptr < end) {
         // Leading and trailing white space, and white space before and after separators, will be ignored.
         const CharType* inputStart = ptr;
         while (ptr < end && *ptr != ',')
             ++ptr;
 
         if (ptr == inputStart)
             break;
 
         // walk backwards from the ; to ignore any whitespace
         const CharType* inputEnd = ptr - 1;
-        while (inputStart < inputEnd && isSVGSpace(*inputEnd))
+        while (inputStart < inputEnd && isHTMLSpace<CharType>(*inputEnd))
             --inputEnd;
 
         values.add(String(inputStart, inputEnd - inputStart + 1));
         skipOptionalSVGSpacesOrDelimiter(ptr, end, ',');
     }
 
     return true;
 }
 
 bool parseGlyphName(const String& input, HashSet<String>& values)
@@ skipping 131 matching lines @@
         // Leading and trailing white space, and white space before and after semicolon separators, will be ignored.
         const CharType* inputStart = ptr;
         while (ptr < end && *ptr != seperator) // careful not to ignore whitespace inside inputs
             ptr++;
 
         if (ptr == inputStart)
             break;
 
         // walk backwards from the ; to ignore any whitespace
         const CharType* inputEnd = ptr - 1;
-        while (inputStart < inputEnd && isSVGSpace(*inputEnd))
+        while (inputStart < inputEnd && isHTMLSpace<CharType>(*inputEnd))
             inputEnd--;
 
         values.append(String(inputStart, inputEnd - inputStart + 1));
         skipOptionalSVGSpacesOrDelimiter(ptr, end, seperator);
     }
 
     return values;
 }
 
 Vector<String> parseDelimitedString(const String& input, const char seperator)
@@ skipping 118 matching lines @@
         parseAndSkipTransformType(ptr, end, type);
     } else {
         const UChar* ptr = string.characters16();
         const UChar* end = ptr + string.length();
         parseAndSkipTransformType(ptr, end, type);
     }
     return type;
 }
 
 }