Refactor propagation of parsing errors for SVG attributes

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

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  *
  * 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/SVGLengthList.h"
 
-#include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/svg/SVGAnimationElement.h"
 #include "core/svg/SVGParserUtilities.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 DEFINE_SVG_PROPERTY_TYPE_CASTS(SVGLengthList);
 
 SVGLengthList::SVGLengthList(SVGLengthMode mode)
     : m_mode(mode)
 {
 }
 
 SVGLengthList::~SVGLengthList()
 {
 }
 
 PassRefPtrWillBeRawPtr<SVGLengthList> SVGLengthList::clone()
 {
     RefPtrWillBeRawPtr<SVGLengthList> ret = SVGLengthList::create(m_mode);
     ret->deepCopy(this);
     return ret.release();
 }
 
 PassRefPtrWillBeRawPtr<SVGPropertyBase> SVGLengthList::cloneForAnimation(const String& value) const
 {
     RefPtrWillBeRawPtr<SVGLengthList> ret = SVGLengthList::create(m_mode);
-    ret->setValueAsString(value, IGNORE_EXCEPTION);
+    ret->setValueAsString(value);
     return ret.release();
 }
 
 String SVGLengthList::valueAsString() const
 {
     StringBuilder builder;
 
     ConstIterator it = begin();
     ConstIterator itEnd = end();
     if (it != itEnd) {
         builder.append(it->valueAsString());
         ++it;
 
         for (; it != itEnd; ++it) {
             builder.append(' ');
             builder.append(it->valueAsString());
         }
     }
 
     return builder.toString();
 }
 
 template <typename CharType>
-void SVGLengthList::parseInternal(const CharType*& ptr, const CharType* end, ExceptionState& exceptionState)
+SVGParsingError SVGLengthList::parseInternal(const CharType*& ptr, const CharType* end)
 {
     clear();
     while (ptr < end) {
         const CharType* start = ptr;
         while (ptr < end && *ptr != ',' && !isHTMLSpace<CharType>(*ptr))
             ptr++;
         if (ptr == start)
             break;
+        String valueString(start, ptr - start);
+        if (valueString.isEmpty())
+            break;
 
         RefPtrWillBeRawPtr<SVGLength> length = SVGLength::create(m_mode);
-        String valueString(start, ptr - start);
-        if (valueString.isEmpty())
-            return;
-        length->setValueAsString(valueString, exceptionState);
-        if (exceptionState.hadException())
-            return;
+        SVGParsingError lengthParseStatus = length->setValueAsString(valueString);
+        if (lengthParseStatus != NoError)
+            return lengthParseStatus;
         append(length);
         skipOptionalSVGSpacesOrDelimiter(ptr, end);
     }
+    return NoError;
 }
 
-void SVGLengthList::setValueAsString(const String& value, ExceptionState& exceptionState)
+SVGParsingError SVGLengthList::setValueAsString(const String& value)
 {
     if (value.isEmpty()) {
         clear();
-        return;
+        return NoError;
     }
+
+    SVGParsingError parseStatus;
     if (value.is8Bit()) {
         const LChar* ptr = value.characters8();
         const LChar* end = ptr + value.length();
-        parseInternal(ptr, end, exceptionState);
+        parseStatus = parseInternal(ptr, end);
     } else {
         const UChar* ptr = value.characters16();
         const UChar* end = ptr + value.length();
-        parseInternal(ptr, end, exceptionState);
+        parseStatus = parseInternal(ptr, end);
     }
+    return parseStatus;
 }
 
 void SVGLengthList::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement* contextElement)
 {
     RefPtrWillBeRawPtr<SVGLengthList> otherList = toSVGLengthList(other);
 
     if (length() != otherList->length())
         return;
 
     SVGLengthContext lengthContext(contextElement);
@@ skipping 39 matching lines @@
         at(i)->setValue(animatedNumber, lengthContext);
     }
 }
 
 float SVGLengthList::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement*)
 {
     // FIXME: Distance calculation is not possible for SVGLengthList right now. We need the distance for every single value.
     return -1;
 }
 }