[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 58 matching lines @@
 
 template<typename CharType>
 SVGLengthType stringToLengthType(const CharType*& ptr, const CharType* end)
 {
     if (ptr == end)
         return LengthTypeNumber;
 
     const UChar firstChar = *ptr;
 
     if (++ptr == end)
-        return firstChar == '%' ? LengthTypePercentage : LengthTypeUnknown;
+        return firstChar == '%' ? LengthTypePercentage : (isSVGSpace(firstChar) ? LengthTypeNumber : LengthTypeUnknown);

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

This isn't needed: if the first character is a percent sign, it's not a space.

[fs, 2014/06/03 14:35:37]

Nested ternary expressions FTW? =)

if (firstChar == '%')
  return percentage;
else if (isSVGSpace(firstChar))
  return number;
else
  return confuzzled;

 
     const UChar secondChar = *ptr;
+    ptr++;
 
-    if (++ptr != end)
-        return LengthTypeUnknown;
+    skipOptionalSVGSpaces(ptr, end);
 
-    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 (ptr == end) {
+        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 (isSVGSpace(secondChar)) {
+            if (isSVGSpace(firstChar))
+                return LengthTypeNumber;

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

Two spaces are a number?

[fs, 2014/06/03 14:35:37]

More like "two spaces are not a unit".

"42  "

And with this and the above I just want to say that I find this parsing
structure kind of hard to follow w/ the WS-bits. I suppose a structure like:

UChar firstChar = *++ptr;
if (firstChar == '%') {
  type = percentage;
} else if (firstChar == 'e') {
  UChar secondChar = ptr < end ? *++ptr : 0;
  if (secondChar == 'm')
    type = ems;
  ...
  else
    return unknown;
} else ... {
  ...
}

if (!skipOptionalSVGSpaces(ptr, end))
  return type;
return unknown;

might read more easily. (Not necessarily suggesting any change be done though.)

(Another option would be sinking the WS-handling out into the caller, i.e.:

  ...
  type = stringToLengthType(ptr, end);
  ASSERT(ptr <= end);
  if (skipOptionalSVGSpaces(ptr, end))
      return false;
  ASSERT(ptr == end);
  return true;

[still requires a minor change to rewind ptr after if second char is
unrecognized])

+            if (firstChar == '%')
+                return LengthTypePercentage;
+        }
+    }
 
     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, ALLOW_LEADING))
         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));
 }
 
 }