commit 51b2906e11752df6c18351cf520e30522d3b53a1
author Torne (Richard Coles) <torne@google.com> Thu Nov 28 11:56:03 2013 +0000
committer Torne (Richard Coles) <torne@google.com> Thu Nov 28 11:56:03 2013 +0000
tree 3997e3ef1a24b5ce4c7e0d770d6b1fba080ab4fa
parent b7934c18a33e7f80239d89a6f402a3863b8e60cb

Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: Ia99affe6e2cf9342843aa38fa1d75355fd5c71f7

Source/core/svg/SVGRectElement.cpp

diff --git a/Source/core/svg/SVGRectElement.cpp b/Source/core/svg/SVGRectElement.cpp
index 2f0e12c..5bb1897 100644
--- a/Source/core/svg/SVGRectElement.cpp
+++ b/Source/core/svg/SVGRectElement.cpp
@@ -50,8 +50,8 @@
     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
 END_REGISTER_ANIMATED_PROPERTIES
 
-inline SVGRectElement::SVGRectElement(const QualifiedName& tagName, Document& document)
-    : SVGGraphicsElement(tagName, document)
+inline SVGRectElement::SVGRectElement(Document& document)
+    : SVGGeometryElement(SVGNames::rectTag, document)
     , m_x(LengthModeWidth)
     , m_y(LengthModeHeight)
     , m_width(LengthModeWidth)
@@ -59,14 +59,13 @@
     , m_rx(LengthModeWidth)
     , m_ry(LengthModeHeight)
 {
-    ASSERT(hasTagName(SVGNames::rectTag));
     ScriptWrappable::init(this);
     registerAnimatedPropertiesForSVGRectElement();
 }
 
-PassRefPtr<SVGRectElement> SVGRectElement::create(const QualifiedName& tagName, Document& document)
+PassRefPtr<SVGRectElement> SVGRectElement::create(Document& document)
 {
-    return adoptRef(new SVGRectElement(tagName, document));
+    return adoptRef(new SVGRectElement(document));
 }
 
 bool SVGRectElement::isSupportedAttribute(const QualifiedName& attrName)
@@ -90,7 +89,7 @@
     SVGParsingError parseError = NoError;
 
     if (!isSupportedAttribute(name))
-        SVGGraphicsElement::parseAttribute(name, value);
+        SVGGeometryElement::parseAttribute(name, value);
     else if (name == SVGNames::xAttr)
         setXBaseValue(SVGLength::construct(LengthModeWidth, value, parseError));
     else if (name == SVGNames::yAttr)
@@ -114,7 +113,7 @@
 void SVGRectElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     if (!isSupportedAttribute(attrName)) {
-        SVGGraphicsElement::svgAttributeChanged(attrName);
+        SVGGeometryElement::svgAttributeChanged(attrName);
         return;
     }