Extended error reporting for SVGNumber/Point/Rect and related types

third_party/WebKit/Source/core/svg/SVGNumberList.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 37 matching lines @@
         for (; it != itEnd; ++it) {
             builder.append(' ');
             builder.append(it->valueAsString());
         }
     }
 
     return builder.toString();
 }
 
 template <typename CharType>
-bool SVGNumberList::parse(const CharType*& ptr, const CharType* end)
+SVGParsingError SVGNumberList::parse(const CharType*& ptr, const CharType* end)
 {
-    clear();
-
+    const CharType* listStart = ptr;
     while (ptr < end) {
         float number = 0;
         if (!parseNumber(ptr, end, number))
-            return false;
+            return SVGParsingError(SVGParseStatus::ExpectedNumber, ptr - listStart);
         append(SVGNumber::create(number));
     }
-
-    return true;
+    return SVGParseStatus::NoError;
 }
 
 SVGParsingError SVGNumberList::setValueAsString(const String& value)
 {
-    if (value.isEmpty()) {
-        clear();
+    clear();
+
+    if (value.isEmpty())
         return SVGParseStatus::NoError;
-    }
 
-    bool valid = false;
+    // Don't call |clear()| if an error is encountered. SVG policy is to use
+    // valid items before error.
+    // Spec: http://www.w3.org/TR/SVG/single-page.html#implnote-ErrorProcessing
     if (value.is8Bit()) {
         const LChar* ptr = value.characters8();
         const LChar* end = ptr + value.length();
-        valid = parse(ptr, end);
-    } else {
-        const UChar* ptr = value.characters16();
-        const UChar* end = ptr + value.length();
-        valid = parse(ptr, end);
+        return parse(ptr, end);
     }
-
-    if (!valid) {
-        // No call to |clear()| here. SVG policy is to use valid items before error.
-        // Spec: http://www.w3.org/TR/SVG/single-page.html#implnote-ErrorProcessing
-        return SVGParseStatus::ParsingFailed;
-    }
-    return SVGParseStatus::NoError;
+    const UChar* ptr = value.characters16();
+    const UChar* end = ptr + value.length();
+    return parse(ptr, end);
 }
 
 void SVGNumberList::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement* contextElement)
 {
     RefPtrWillBeRawPtr<SVGNumberList> otherList = toSVGNumberList(other);
 
     if (length() != otherList->length())
         return;
 
     for (size_t i = 0; i < length(); ++i)
@@ skipping 33 matching lines @@
 Vector<float> SVGNumberList::toFloatVector() const
 {
     Vector<float> vec;
     vec.reserveInitialCapacity(length());
     for (size_t i = 0; i < length(); ++i)
         vec.uncheckedAppend(at(i)->value());
     return vec;
 }
 
 }