Changeset 90304 in webkit

Timestamp:

Jul 1, 2011, 5:43:45 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2011-07-01 Tim Horton <​timothy_horton@apple.com>

Reviewed by Darin Adler.

Errors encountered within SVG documents should be reported to the console
​https://bugs.webkit.org/show_bug.cgi?id=62599

Add SVGElement::reportAttributeParsingError, which will
write a Web Inspector console message if passed an SVGParsingError
and the attribute which was being applied, only in the case where
there is actually an error.

Include the SVG document's URI when writing to the Web Inspector
console, so that the UI displays both the filename and the line number.

• svg/SVGDocumentExtensions.cpp: (WebCore::reportMessage):
• svg/SVGElement.cpp: (WebCore::SVGElement::reportAttributeParsingError):
• svg/SVGElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGDocumentExtensions.cpp (modified) (1 diff)
• svg/SVGElement.cpp (modified) (1 diff)
• svg/SVGElement.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-01  Tim Horton  <timothy_horton@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Errors encountered within SVG documents should be reported to the console
+        https://bugs.webkit.org/show_bug.cgi?id=62599
+
+        Add SVGElement::reportAttributeParsingError, which will
+        write a Web Inspector console message if passed an SVGParsingError
+        and the attribute which was being applied, only in the case where
+        there is actually an error.
+
+        Include the SVG document's URI when writing to the Web Inspector
+        console, so that the UI displays both the filename and the line number.
+
+        * svg/SVGDocumentExtensions.cpp:
+        (WebCore::reportMessage):
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::reportAttributeParsingError):
+        * svg/SVGElement.h:
+
 2011-07-01  Scott Byer  <scottbyer@chromium.org>
 

trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp

@@ -199 +199 @@
 {
     if (Frame* frame = document->frame())
-        frame->domWindow()->console()->addMessage(JSMessageSource, LogMessageType, level, message, parserLineNumber(document), String());
+        frame->domWindow()->console()->addMessage(JSMessageSource, LogMessageType, level, message, parserLineNumber(document), document->documentURI());
 }
 

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -104 +104 @@
 }
 
+void SVGElement::reportAttributeParsingError(SVGParsingError error, Attribute* attribute)
+{
+    if (error == NoError)
+        return;
+
+    String errorString = "<" + tagName() + "> attribute " + attribute->name().toString() + "=\"" + attribute->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();
+}
+
+
 bool SVGElement::isSupported(StringImpl* feature, StringImpl* version) const
 {

trunk/Source/WebCore/svg/SVGElement.h

@@ -48 +48 @@
     AnimatedTransformList,
     AnimatedUnknown
+};
+
+enum SVGParsingError {
+    NoError,
+    ParsingAttributeFailedError,
+    NegativeValueForbiddenError
 };
 
@@ -124 +130 @@
     SVGElementRareData* ensureRareSVGData();
 
+    void reportAttributeParsingError(SVGParsingError, Attribute*);
+
 private:
     friend class SVGElementInstance;