Error reporting for SVGLength and SVGLengthList

third_party/WebKit/Source/core/svg/SVGLengthList.cpp

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  *
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 53 matching lines @@
             builder.append(it->valueAsString());
         }
     }
 
     return builder.toString();
 }
 
 template <typename CharType>
 SVGParsingError SVGLengthList::parseInternal(const CharType*& ptr, const CharType* end)
 {
-    clear();
+    const CharType* listStart = ptr;
     while (ptr < end) {
         const CharType* start = ptr;
         while (ptr < end && *ptr != ',' && !isHTMLSpace<CharType>(*ptr))
             ptr++;
         if (ptr == start)
             break;
         String valueString(start, ptr - start);
         if (valueString.isEmpty())
             break;
 
         RefPtrWillBeRawPtr<SVGLength> length = SVGLength::create(m_mode);
         SVGParsingError lengthParseStatus = length->setValueAsString(valueString);
         if (lengthParseStatus != SVGParseStatus::NoError)
-            return lengthParseStatus;
+            return lengthParseStatus.offsetWith(start - listStart);
         append(length);
         skipOptionalSVGSpacesOrDelimiter(ptr, end);
     }
     return SVGParseStatus::NoError;
 }
 
 SVGParsingError SVGLengthList::setValueAsString(const String& value)
 {
-    if (value.isEmpty()) {
-        clear();
+    clear();
+
+    if (value.isEmpty())
         return SVGParseStatus::NoError;
-    }
 
-    SVGParsingError parseStatus;
     if (value.is8Bit()) {
         const LChar* ptr = value.characters8();
         const LChar* end = ptr + value.length();
-        parseStatus = parseInternal(ptr, end);
-    } else {
-        const UChar* ptr = value.characters16();
-        const UChar* end = ptr + value.length();
-        parseStatus = parseInternal(ptr, end);
+        return parseInternal(ptr, end);
     }
-    return parseStatus;
+    const UChar* ptr = value.characters16();
+    const UChar* end = ptr + value.length();
+    return parseInternal(ptr, end);
 }
 
 void SVGLengthList::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement* contextElement)
 {
     RefPtrWillBeRawPtr<SVGLengthList> otherList = toSVGLengthList(other);
 
     if (length() != otherList->length())
         return;
 
     SVGLengthContext lengthContext(contextElement);
@@ skipping 39 matching lines @@
         at(i)->setValue(animatedNumber, lengthContext);
     }
 }
 
 float SVGLengthList::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement*)
 {
     // FIXME: Distance calculation is not possible for SVGLengthList right now. We need the distance for every single value.
     return -1;
 }
 } // namespace blink