Refactor propagation of parsing errors for SVG attributes

third_party/WebKit/Source/core/svg/SVGRect.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/SVGRect.h"
 
-#include "bindings/core/v8/ExceptionState.h"
-#include "core/dom/ExceptionCode.h"
 #include "core/svg/SVGAnimationElement.h"
 #include "core/svg/SVGParserUtilities.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 SVGRect::SVGRect()
     : m_isValid(true)
 {
 }
 
 SVGRect::SVGRect(const FloatRect& rect)
     : m_isValid(true)
     , m_value(rect)
 {
 }
 
 PassRefPtrWillBeRawPtr<SVGRect> SVGRect::clone() const
 {
     return SVGRect::create(m_value);
 }
 
 template<typename CharType>
-void SVGRect::parse(const CharType*& ptr, const CharType* end, ExceptionState& exceptionState)
+bool SVGRect::parse(const CharType*& ptr, const CharType* end)
 {
-    const CharType* start = ptr;
-
     skipOptionalSVGSpaces(ptr, end);
 
     float x = 0.0f;
     float y = 0.0f;
     float width = 0.0f;
     float height = 0.0f;
     bool valid = parseNumber(ptr, end, x) && parseNumber(ptr, end, y) && parseNumber(ptr, end, width) && parseNumber(ptr, end, height, DisallowWhitespace);
 
-    if (!valid) {
-        exceptionState.throwDOMException(SyntaxError, "Problem parsing rect \"" + String(start, end - start) + "\"");
-        setInvalid();
-        return;
-    }
+    if (!valid)
+        return false;
 
-    skipOptionalSVGSpaces(ptr, end);
-    if (ptr < end) { // nothing should come after the last, fourth number
-        exceptionState.throwDOMException(SyntaxError, "Problem parsing rect \"" + String(start, end - start) + "\"");
-        setInvalid();
-        return;
+    if (skipOptionalSVGSpaces(ptr, end)) {
+        // Nothing should come after the last, fourth number.
+        return false;
     }
 
     m_value = FloatRect(x, y, width, height);
     m_isValid = true;
+    return true;
 }
 
-void SVGRect::setValueAsString(const String& string, ExceptionState& exceptionState)
+SVGParsingError SVGRect::setValueAsString(const String& string)
 {
-    if (string.isNull()) {
-        setInvalid();
-        return;
-    }
+    setInvalid();
+
+    if (string.isNull())
+        return NoError;
+
     if (string.isEmpty()) {
         m_value = FloatRect(0.0f, 0.0f, 0.0f, 0.0f);
         m_isValid = true;
-        return;
+        return NoError;
     }
 
+    bool valid;
     if (string.is8Bit()) {
         const LChar* ptr = string.characters8();
         const LChar* end = ptr + string.length();
-        parse(ptr, end, exceptionState);
-        return;
+        valid = parse(ptr, end);
+    } else {
+        const UChar* ptr = string.characters16();
+        const UChar* end = ptr + string.length();
+        valid = parse(ptr, end);
     }
-
-    const UChar* ptr = string.characters16();
-    const UChar* end = ptr + string.length();
-    parse(ptr, end, exceptionState);
+    return valid ? NoError : ParsingAttributeFailedError;
 }
 
 String SVGRect::valueAsString() const
 {
     StringBuilder builder;
     builder.appendNumber(x());
     builder.append(' ');
     builder.appendNumber(y());
     builder.append(' ');
     builder.appendNumber(width());
@@ skipping 32 matching lines @@
     return -1;
 }
 
 void SVGRect::setInvalid()
 {
     m_value = FloatRect(0.0f, 0.0f, 0.0f, 0.0f);
     m_isValid = false;
 }
 
 }