Refactor propagation of parsing errors for SVG attributes

third_party/WebKit/Source/core/svg/SVGNumber.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 48 matching lines @@
     }
 
     if (ptr != end) {
         m_value = 0;
         return false;
     }
 
     return true;
 }
 
-void SVGNumber::setValueAsString(const String& string, ExceptionState& exceptionState)
+SVGParsingError SVGNumber::setValueAsString(const String& string)
 {
     if (string.isEmpty()) {
         m_value = 0;
-        return;
+        return NoError;
     }
 
     bool valid = false;
     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);
     }
 
     if (!valid) {
-        exceptionState.throwDOMException(SyntaxError, "The value provided ('" + string + "') is invalid.");
         m_value = 0;

[pdr., 2015/12/23 04:00:08]

Nit for contemplation: this isn't required, but we're not very consistent with
where the state is set (in parse vs in set).

[fs, 2015/12/23 10:04:17]

Yes, I've been noticing these things here and there as I've gone through all of
these... I have done some cleanup here and there. Will make another sweep with
this in mind.

+        return ParsingAttributeFailedError;
     }
+    return NoError;
 }
 
 void SVGNumber::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)
 {
     setValue(m_value + toSVGNumber(other)->value());
 }
 
 void SVGNumber::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDuration, SVGElement*)
 {
     ASSERT(animationElement);
 
     RefPtrWillBeRawPtr<SVGNumber> fromNumber = toSVGNumber(from);
     RefPtrWillBeRawPtr<SVGNumber> toNumber = toSVGNumber(to);
     RefPtrWillBeRawPtr<SVGNumber> toAtEndOfDurationNumber = toSVGNumber(toAtEndOfDuration);
 
     animationElement->animateAdditiveNumber(percentage, repeatCount, fromNumber->value(), toNumber->value(), toAtEndOfDurationNumber->value(), m_value);
 }
 
 float SVGNumber::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)
 {
     return fabsf(m_value - toSVGNumber(other)->value());
 }
 
 PassRefPtrWillBeRawPtr<SVGNumber> SVGNumberAcceptPercentage::clone() const
 {
     return create(m_value);
 }
 
-void SVGNumberAcceptPercentage::setValueAsString(const String& string, ExceptionState& exceptionState)
+SVGParsingError SVGNumberAcceptPercentage::setValueAsString(const String& string)
 {
-    bool valid = parseNumberOrPercentage(string, m_value);
+    if (parseNumberOrPercentage(string, m_value))
+        return NoError;
 
-    if (!valid) {
-        exceptionState.throwDOMException(SyntaxError, "The value provided ('" + string + "') is invalid.");
-        m_value = 0;
-    }
+    m_value = 0;
+    return ParsingAttributeFailedError;
 }
 
 SVGNumberAcceptPercentage::SVGNumberAcceptPercentage(float value)
     : SVGNumber(value)
 {
 }
 
 }