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

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

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
     : m_value(point)
 {
 }
 
 PassRefPtrWillBeRawPtr<SVGPoint> SVGPoint::clone() const
 {
     return SVGPoint::create(m_value);
 }
 
 template<typename CharType>
-bool SVGPoint::parse(const CharType*& ptr, const CharType* end)
+SVGParsingError SVGPoint::parse(const CharType*& ptr, const CharType* end)
 {
-    skipOptionalSVGSpaces(ptr, end);
-
-    float x = 0.0f;
-    float y = 0.0f;
-    bool valid = parseNumber(ptr, end, x) && parseNumber(ptr, end, y, DisallowWhitespace);
-
-    if (!valid)
-        return false;
+    float x = 0;
+    float y = 0;
+    if (!parseNumber(ptr, end, x)
+        || !parseNumber(ptr, end, y, DisallowWhitespace))
+        return SVGParseStatus::ExpectedNumber;
 
     if (skipOptionalSVGSpaces(ptr, end)) {
         // Nothing should come after the second number.
-        return false;
+        return SVGParseStatus::TrailingGarbage;
     }
 
     m_value = FloatPoint(x, y);
-    return true;
+    return SVGParseStatus::NoError;
 }
 
 FloatPoint SVGPoint::matrixTransform(const AffineTransform& transform) const
 {
     double newX, newY;
     transform.map(static_cast<double>(x()), static_cast<double>(y()), newX, newY);
     return FloatPoint::narrowPrecision(newX, newY);
 }
 
 SVGParsingError SVGPoint::setValueAsString(const String& string)
 {
     if (string.isEmpty()) {
         m_value = FloatPoint(0.0f, 0.0f);
         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 SVGPoint::valueAsString() const
 {
     StringBuilder builder;
     builder.appendNumber(x());
     builder.append(' ');
     builder.appendNumber(y());
     return builder.toString();
 }
@@ skipping 11 matching lines @@
 }
 
 float SVGPoint::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement* contextElement)
 {
     // SVGPoint is not animated by itself
     ASSERT_NOT_REACHED();
     return 0.0f;
 }
 
 }