[SVG2] Allow leading and trailing whitespace in svg attributes

Source/core/svg/SVGLength.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 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 55 matching lines @@
     ASSERT_NOT_REACHED();
     return String();
 }
 
 template<typename CharType>
 SVGLengthType stringToLengthType(const CharType*& ptr, const CharType* end)
 {
     if (ptr == end)
         return LengthTypeNumber;
 
-    const UChar firstChar = *ptr;
+    SVGLengthType type = LengthTypeUnknown;
+    const CharType firstChar = *ptr++;
 
-    if (++ptr == end)
-        return firstChar == '%' ? LengthTypePercentage : LengthTypeUnknown;
+    if (firstChar == '%') {
+        type = LengthTypePercentage;
+    } else if (isHTMLSpace<CharType>(firstChar)) {
+        type = LengthTypeNumber;
+    } else if (ptr < end) {
+        const CharType secondChar = *ptr++;
 
-    const UChar secondChar = *ptr;
+        if (firstChar == 'p') {
+            if (secondChar == 'x')
+                type = LengthTypePX;
+            if (secondChar == 't')
+                type = LengthTypePT;
+            if (secondChar == 'c')
+                type = LengthTypePC;
+        } else if (firstChar == 'e') {
+            if (secondChar == 'm')
+                type = LengthTypeEMS;
+            if (secondChar == 'x')
+                type = LengthTypeEXS;
+        } else if (firstChar == 'c' && secondChar == 'm') {
+            type = LengthTypeCM;
+        } else if (firstChar == 'm' && secondChar == 'm') {
+            type = LengthTypeMM;
+        } else if (firstChar == 'i' && secondChar == 'n') {
+            type = LengthTypeIN;
+        } else if (isHTMLSpace<CharType>(firstChar) && isHTMLSpace<CharType>(secondChar)) {
+            type = LengthTypeNumber;
+        }
+    }
 
-    if (++ptr != end)
-        return LengthTypeUnknown;
-
-    if (firstChar == 'e' && secondChar == 'm')
-        return LengthTypeEMS;
-    if (firstChar == 'e' && secondChar == 'x')
-        return LengthTypeEXS;
-    if (firstChar == 'p' && secondChar == 'x')
-        return LengthTypePX;
-    if (firstChar == 'c' && secondChar == 'm')
-        return LengthTypeCM;
-    if (firstChar == 'm' && secondChar == 'm')
-        return LengthTypeMM;
-    if (firstChar == 'i' && secondChar == 'n')
-        return LengthTypeIN;
-    if (firstChar == 'p' && secondChar == 't')
-        return LengthTypePT;
-    if (firstChar == 'p' && secondChar == 'c')
-        return LengthTypePC;
+    if (!skipOptionalSVGSpaces(ptr, end))
+        return type;
 
     return LengthTypeUnknown;
 }
 
 } // namespace
 
 SVGLength::SVGLength(SVGLengthMode mode)
     : SVGPropertyBase(classType())
     , m_valueInSpecifiedUnits(0)
     , m_unitMode(mode)
@@ skipping 70 matching lines @@
 
     return m_valueInSpecifiedUnits;
 }
 
 template<typename CharType>
 static bool parseValueInternal(const String& string, float& convertedNumber, SVGLengthType& type)
 {
     const CharType* ptr = string.getCharacters<CharType>();
     const CharType* end = ptr + string.length();
 
-    if (!parseNumber(ptr, end, convertedNumber, false))
+    if (!parseNumber(ptr, end, convertedNumber, AllowLeadingWhitespace))
         return false;
 
     type = stringToLengthType(ptr, end);
     ASSERT(ptr <= end);
     if (type == LengthTypeUnknown)
         return false;
 
     return true;
 }
 
@@ skipping 255 matching lines @@
 
 float SVGLength::calculateDistance(PassRefPtr<SVGPropertyBase> toValue, SVGElement* contextElement)
 {
     SVGLengthContext lengthContext(contextElement);
     RefPtr<SVGLength> toLength = toSVGLength(toValue);
 
     return fabsf(toLength->value(lengthContext, IGNORE_EXCEPTION) - value(lengthContext, IGNORE_EXCEPTION));
 }
 
 }