Extended error reporting for SVG attribute parsing

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * 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
@@ skipping 35 matching lines @@
 #include "core/layout/svg/LayoutSVGResourceContainer.h"
 #include "core/svg/SVGAnimateElement.h"
 #include "core/svg/SVGCursorElement.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGElementRareData.h"
 #include "core/svg/SVGGraphicsElement.h"
 #include "core/svg/SVGSVGElement.h"
 #include "core/svg/SVGTitleElement.h"
 #include "core/svg/SVGUseElement.h"
 #include "core/svg/properties/SVGProperty.h"
-#include "platform/JSONValues.h"
 #include "wtf/TemporaryChange.h"
 #include "wtf/Threading.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 using namespace SVGNames;
 
 SVGElement::SVGElement(const QualifiedName& tagName, Document& document, ConstructionType constructionType)
     : Element(tagName, &document, constructionType)
@@ skipping 115 matching lines @@
     // we're always an inner <svg> element.
     if (inUseShadowTree() && parentOrShadowHostElement() && parentOrShadowHostElement()->isSVGElement())
         return false;
 
     // This is true whenever this is the outermost SVG, even if there are HTML elements outside it
     return !parentNode()->isSVGElement();
 }
 
 void SVGElement::reportAttributeParsingError(SVGParsingError error, const QualifiedName& name, const AtomicString& value)
 {
-    if (error == NoError)
+    if (error == SVGParseStatus::NoError)
         return;
-
-    String errorString = "<" + tagName() + "> attribute " + name.toString() + "=" + JSONValue::quoteString(value);
-    SVGDocumentExtensions& extensions = document().accessSVGExtensions();
-
-    if (error == NegativeValueForbiddenError) {
-        extensions.reportError("Invalid negative value for " + errorString);
-        return;
-    }
-
-    if (error == ParsingAttributeFailedError) {
-        extensions.reportError("Invalid value for " + errorString);
-        return;
-    }
-
-    ASSERT_NOT_REACHED();
+    document().accessSVGExtensions().reportError(error.format(tagName(), name, value));
 }
 
 String SVGElement::title() const
 {
     // According to spec, we should not return titles when hovering over root <svg> elements (those
     // <title> elements are the title of the document, not a tooltip) so we instantly return.
     if (isOutermostSVGSVGElement())
         return String();
 
     if (inUseShadowTree()) {
@@ skipping 1022 matching lines @@
     Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt", AtomicString::ConstructFromLiteral));
     return evtString;
 }
 
 } // namespace blink