Error reporting for SVGInteger and SVGIntegerOptionalInteger

third_party/WebKit/Source/core/svg/SVGInteger.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 34 matching lines @@
     return create(m_value);
 }
 
 String SVGInteger::valueAsString() const
 {
     return String::number(m_value);
 }
 
 SVGParsingError SVGInteger::setValueAsString(const String& string)
 {
-    if (string.isEmpty()) {
-        m_value = 0;
+    m_value = 0;
+
+    if (string.isEmpty())
         return SVGParseStatus::NoError;
-    }
 
     bool valid = true;
     m_value = stripLeadingAndTrailingHTMLSpaces(string).toIntStrict(&valid);
-
-    if (!valid) {
-        m_value = 0;
-        return SVGParseStatus::ParsingFailed;
-    }
-    return SVGParseStatus::NoError;
+    // toIntStrict returns 0 if valid == false.
+    return valid ? SVGParseStatus::NoError : SVGParseStatus::ExpectedInteger;
 }
 
 void SVGInteger::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)
 {
     setValue(m_value + toSVGInteger(other)->value());
 }
 
 void SVGInteger::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDuration, SVGElement*)
 {
     ASSERT(animationElement);
 
     RefPtrWillBeRawPtr<SVGInteger> fromInteger = toSVGInteger(from);
     RefPtrWillBeRawPtr<SVGInteger> toInteger = toSVGInteger(to);
     RefPtrWillBeRawPtr<SVGInteger> toAtEndOfDurationInteger = toSVGInteger(toAtEndOfDuration);
 
     float animatedFloat = m_value;
     animationElement->animateAdditiveNumber(percentage, repeatCount, fromInteger->value(), toInteger->value(), toAtEndOfDurationInteger->value(), animatedFloat);
     m_value = static_cast<int>(roundf(animatedFloat));
 }
 
 float SVGInteger::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)
 {
     return abs(m_value - toSVGInteger(other)->value());
 }
 
 } // namespace blink