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

third_party/WebKit/Source/core/svg/SVGRect.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 27 matching lines @@
     , m_value(rect)
 {
 }
 
 PassRefPtrWillBeRawPtr<SVGRect> SVGRect::clone() const
 {
     return SVGRect::create(m_value);
 }
 
 template<typename CharType>
-bool SVGRect::parse(const CharType*& ptr, const CharType* end)
+SVGParsingError SVGRect::parse(const CharType*& ptr, const CharType* end)
 {
-    skipOptionalSVGSpaces(ptr, end);
-
-    float x = 0.0f;
-    float y = 0.0f;
-    float width = 0.0f;
-    float height = 0.0f;
-    bool valid = parseNumber(ptr, end, x) && parseNumber(ptr, end, y) && parseNumber(ptr, end, width) && parseNumber(ptr, end, height, DisallowWhitespace);
-
-    if (!valid)
-        return false;
+    const CharType* start = ptr;
+    float x = 0;
+    float y = 0;
+    float width = 0;
+    float height = 0;
+    if (!parseNumber(ptr, end, x)
+        || !parseNumber(ptr, end, y)
+        || !parseNumber(ptr, end, width)
+        || !parseNumber(ptr, end, height, DisallowWhitespace))
+        return SVGParsingError(SVGParseStatus::ExpectedNumber, ptr - start);
 
     if (skipOptionalSVGSpaces(ptr, end)) {
         // Nothing should come after the last, fourth number.
-        return false;
+        return SVGParsingError(SVGParseStatus::TrailingGarbage, ptr - start);
     }
 
     m_value = FloatRect(x, y, width, height);
     m_isValid = true;
-    return true;
+    return SVGParseStatus::NoError;
 }
 
 SVGParsingError SVGRect::setValueAsString(const String& string)
 {
     setInvalid();
 
     if (string.isNull())
         return SVGParseStatus::NoError;
 
     if (string.isEmpty()) {
         m_value = FloatRect(0.0f, 0.0f, 0.0f, 0.0f);
         m_isValid = true;
         return SVGParseStatus::NoError;
     }
 
-    bool valid;
     if (string.is8Bit()) {
         const LChar* ptr = string.characters8();
         const LChar* end = ptr + string.length();
-        valid = parse(ptr, end);
-    } else {
-        const UChar* ptr = string.characters16();
-        const UChar* end = ptr + string.length();
-        valid = parse(ptr, end);
+        return parse(ptr, end);
     }
-    return valid ? SVGParseStatus::NoError : SVGParseStatus::ParsingFailed;
+    const UChar* ptr = string.characters16();
+    const UChar* end = ptr + string.length();
+    return parse(ptr, end);
 }
 
 String SVGRect::valueAsString() const
 {
     StringBuilder builder;
     builder.appendNumber(x());
     builder.append(' ');
     builder.appendNumber(y());
     builder.append(' ');
     builder.appendNumber(width());
@@ skipping 32 matching lines @@
     return -1;
 }
 
 void SVGRect::setInvalid()
 {
     m_value = FloatRect(0.0f, 0.0f, 0.0f, 0.0f);
     m_isValid = false;
 }
 
 }