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

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 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 38 matching lines @@
         for (; it != itEnd; ++it) {
             builder.append(' ');
             builder.append(it->valueAsString());
         }
     }
 
     return builder.toString();
 }
 
 template <typename CharType>
-bool SVGPointList::parse(const CharType*& ptr, const CharType* end)
+SVGParsingError SVGPointList::parse(const CharType*& ptr, const CharType* end)
 {
-    clear();
+    if (!skipOptionalSVGSpaces(ptr, end))
+        return SVGParseStatus::NoError;
 
-    skipOptionalSVGSpaces(ptr, end);
-    if (ptr >= end)
-        return true;
+    const CharType* listStart = ptr;
+    for (;;) {
+        float x = 0;
+        float y = 0;
+        if (!parseNumber(ptr, end, x)
+            || !parseNumber(ptr, end, y, DisallowWhitespace))
+            return SVGParsingError(SVGParseStatus::ExpectedNumber, ptr - listStart);
 
-    for (;;) {
-        float x = 0.0f;
-        float y = 0.0f;
-        bool valid = parseNumber(ptr, end, x) && parseNumber(ptr, end, y, DisallowWhitespace);
-        if (!valid) {
-            return false;
-        }
         append(SVGPoint::create(FloatPoint(x, y)));
 
-        skipOptionalSVGSpaces(ptr, end);
-        if (ptr < end && *ptr == ',') {
+        if (!skipOptionalSVGSpaces(ptr, end))
+            break;
+
+        if (*ptr == ',') {
             ++ptr;
             skipOptionalSVGSpaces(ptr, end);
 
             // ',' requires the list to be continued
             continue;
         }
-
-        // check end of list
-        if (ptr >= end)
-            return true;
     }
+    return SVGParseStatus::NoError;
 }
 
 SVGParsingError SVGPointList::setValueAsString(const String& value)
 {
-    if (value.isEmpty()) {
-        clear();
+    clear();
+
+    if (value.isEmpty())
         return SVGParseStatus::NoError;
-    }
 
-    bool valid = false;
     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);
     }
-    return valid ? SVGParseStatus::NoError : SVGParseStatus::ParsingFailed;
+    const UChar* ptr = value.characters16();
+    const UChar* end = ptr + value.length();
+    return parse(ptr, end);
 }
 
 void SVGPointList::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement* contextElement)
 {
     RefPtrWillBeRawPtr<SVGPointList> otherList = toSVGPointList(other);
 
     if (length() != otherList->length())
         return;
 
     for (size_t i = 0; i < length(); ++i)
@@ skipping 31 matching lines @@
     }
 }
 
 float SVGPointList::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement*)
 {
     // FIXME: Distance calculation is not possible for SVGPointList right now. We need the distance for every single value.
     return -1;
 }
 
 }