Refactor propagation of parsing errors for SVG attributes

third_party/WebKit/Source/core/svg/SVGLength.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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/svg/SVGLength.h"
 
-#include "bindings/core/v8/ExceptionState.h"
 #include "core/SVGNames.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSValue.h"
 #include "core/css/CSSValuePool.h"
 #include "core/css/parser/CSSParser.h"
-#include "core/dom/ExceptionCode.h"
 #include "core/svg/SVGAnimationElement.h"
-#include "core/svg/SVGParserUtilities.h"
-#include "platform/animation/AnimationUtilities.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 SVGLength::SVGLength(SVGLengthMode mode)
     : SVGPropertyBase(classType())
     , m_value(cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::UserUnits))
     , m_unitMode(static_cast<unsigned>(mode))
 {
@@ skipping 14 matching lines @@
 }
 
 PassRefPtrWillBeRawPtr<SVGLength> SVGLength::clone() const
 {
     return adoptRefWillBeNoop(new SVGLength(*this));
 }
 
 PassRefPtrWillBeRawPtr<SVGPropertyBase> SVGLength::cloneForAnimation(const String& value) const
 {
     RefPtrWillBeRawPtr<SVGLength> length = create();
-
     length->m_unitMode = m_unitMode;
 
-    TrackExceptionState exceptionState;
-    length->setValueAsString(value, exceptionState);
-    if (exceptionState.hadException()) {
-        length->m_value = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::UserUnits);
-    }
+    SVGParsingError status = length->setValueAsString(value);
+    if (status != NoError)
+        length->m_value = cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::UserUnits);
 
     return length.release();
 }
 
 bool SVGLength::operator==(const SVGLength& other) const
 {
     return m_unitMode == other.m_unitMode && m_value == other.m_value;
 }
 
 float SVGLength::value(const SVGLengthContext& context) const
@@ skipping 46 matching lines @@
 float SVGLength::scaleByPercentage(float input) const
 {
     float result = input * m_value->getFloatValue();
     if (m_value->isPercentage()) {
         // Delaying division by 100 as long as possible since it introduces floating point errors.
         result = result / 100;
     }
     return result;
 }
 
-void SVGLength::setValueAsString(const String& string, ExceptionState& exceptionState)
+SVGParsingError SVGLength::setValueAsString(const String& string)
 {
     if (string.isEmpty()) {
         m_value = cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::UserUnits);
-        return;
+        return NoError;
     }
 
     CSSParserContext svgParserContext(SVGAttributeMode, 0);
     RefPtrWillBeRawPtr<CSSValue> parsed = CSSParser::parseSingleValue(CSSPropertyX, string, svgParserContext);
-    if (!parsed || !parsed->isPrimitiveValue()) {
-        exceptionState.throwDOMException(SyntaxError, "The value provided ('" + string + "') is invalid.");
-        return;
-    }
+    if (!parsed || !parsed->isPrimitiveValue())
+        return ParsingAttributeFailedError;
 
     CSSPrimitiveValue* newValue = toCSSPrimitiveValue(parsed.get());
     // TODO(fs): Enable calc for SVG lengths
-    if (newValue->isCalculated() || !isSupportedCSSUnitType(newValue->typeWithCalcResolved())) {
-        exceptionState.throwDOMException(SyntaxError, "The value provided ('" + string + "') is invalid.");
-        return;
-    }
+    if (newValue->isCalculated() || !isSupportedCSSUnitType(newValue->typeWithCalcResolved()))
+        return ParsingAttributeFailedError;
 
     m_value = newValue;
+    return NoError;
 }
 
 String SVGLength::valueAsString() const
 {
     return m_value->customCSSText();
 }
 
 void SVGLength::newValueSpecifiedUnits(CSSPrimitiveValue::UnitType type, float value)
 {
     m_value = CSSPrimitiveValue::create(value, type);
@@ skipping 98 matching lines @@
 
 float SVGLength::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> toValue, SVGElement* contextElement)
 {
     SVGLengthContext lengthContext(contextElement);
     RefPtrWillBeRawPtr<SVGLength> toLength = toSVGLength(toValue);
 
     return fabsf(toLength->value(lengthContext) - value(lengthContext));
 }
 
 }