Refactor propagation of parsing errors for SVG attributes

third_party/WebKit/Source/core/svg/SVGLengthTearOff.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 113 matching lines @@
     SVGLengthContext lengthContext(contextElement());
     target()->setValue(value, lengthContext);
     commitChange();
 }
 
 float SVGLengthTearOff::valueInSpecifiedUnits()
 {
     return target()->valueInSpecifiedUnits();
 }
 
-void SVGLengthTearOff::setValueInSpecifiedUnits(float value, ExceptionState& es)
+void SVGLengthTearOff::setValueInSpecifiedUnits(float value, ExceptionState& exceptionState)
 {
     if (isImmutable()) {
-        es.throwDOMException(NoModificationAllowedError, "The attribute is read-only.");
+        exceptionState.throwDOMException(NoModificationAllowedError, "The attribute is read-only.");
         return;
     }
     target()->setValueInSpecifiedUnits(value);
     commitChange();
 }
 
 String SVGLengthTearOff::valueAsString()
 {
     // TODO(shanmuga.m@samsung.com): Not all <length> properties have 0 (with no unit) as the default (lacuna) value, Need to return default value instead of 0
     return hasExposedLengthUnit() ? target()->valueAsString() : String::number(0);
 }
 
-void SVGLengthTearOff::setValueAsString(const String& str, ExceptionState& es)
+void SVGLengthTearOff::setValueAsString(const String& str, ExceptionState& exceptionState)
 {
     if (isImmutable()) {
-        es.throwDOMException(NoModificationAllowedError, "The attribute is read-only.");
+        exceptionState.throwDOMException(NoModificationAllowedError, "The attribute is read-only.");
         return;
     }
 
     String oldValue = target()->valueAsString();
 
-    target()->setValueAsString(str, es);
+    SVGParsingError status = target()->setValueAsString(str);
 
-    if (!es.hadException() && !hasExposedLengthUnit()) {
-        target()->setValueAsString(oldValue, ASSERT_NO_EXCEPTION); // rollback to old value
-        es.throwDOMException(SyntaxError, "The value provided ('" + str + "') is invalid.");
+    if (status == NoError && !hasExposedLengthUnit()) {
+        target()->setValueAsString(oldValue); // rollback to old value
+        status = ParsingAttributeFailedError;
+    }
+    if (status != NoError) {
+        exceptionState.throwDOMException(SyntaxError, "The value provided ('" + str + "') is invalid.");
         return;
     }
 
     commitChange();
 }
 
 void SVGLengthTearOff::newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits, ExceptionState& exceptionState)
 {
     if (isImmutable()) {
         exceptionState.throwDOMException(NoModificationAllowedError, "The object is read-only.");
@@ skipping 31 matching lines @@
     target()->convertToSpecifiedUnits(toCSSUnitType(unitType), lengthContext);
     commitChange();
 }
 
 SVGLengthTearOff::SVGLengthTearOff(PassRefPtrWillBeRawPtr<SVGLength> target, SVGElement* contextElement, PropertyIsAnimValType propertyIsAnimVal, const QualifiedName& attributeName)
     : SVGPropertyTearOff<SVGLength>(target, contextElement, propertyIsAnimVal, attributeName)
 {
 }
 
 }