Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / svg / SVGEllipseElement.cpp

diff --git a/src/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp b/src/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp
index 5da4774..436931a 100644 (file)
--- a/src/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp
+++ b/src/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp
@@ -29,17 +29,12 @@
 
 namespace WebCore {
 
-// Animated property definitions
-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGEllipseElement)
-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
-END_REGISTER_ANIMATED_PROPERTIES
-
 inline SVGEllipseElement::SVGEllipseElement(Document& document)
     : SVGGeometryElement(SVGNames::ellipseTag, document)
-    , m_cx(SVGAnimatedLength::create(this, SVGNames::cxAttr, SVGLength::create(LengthModeWidth)))
-    , m_cy(SVGAnimatedLength::create(this, SVGNames::cyAttr, SVGLength::create(LengthModeHeight)))
-    , m_rx(SVGAnimatedLength::create(this, SVGNames::rxAttr, SVGLength::create(LengthModeWidth)))
-    , m_ry(SVGAnimatedLength::create(this, SVGNames::ryAttr, SVGLength::create(LengthModeHeight)))
+    , m_cx(SVGAnimatedLength::create(this, SVGNames::cxAttr, SVGLength::create(LengthModeWidth), AllowNegativeLengths))
+    , m_cy(SVGAnimatedLength::create(this, SVGNames::cyAttr, SVGLength::create(LengthModeHeight), AllowNegativeLengths))
+    , m_rx(SVGAnimatedLength::create(this, SVGNames::rxAttr, SVGLength::create(LengthModeWidth), ForbidNegativeLengths))
+    , m_ry(SVGAnimatedLength::create(this, SVGNames::ryAttr, SVGLength::create(LengthModeHeight), ForbidNegativeLengths))
 {
     ScriptWrappable::init(this);
 
@@ -47,7 +42,6 @@ inline SVGEllipseElement::SVGEllipseElement(Document& document)
     addToPropertyMap(m_cy);
     addToPropertyMap(m_rx);
     addToPropertyMap(m_ry);
-    registerAnimatedPropertiesForSVGEllipseElement();
 }
 
 PassRefPtr<SVGEllipseElement> SVGEllipseElement::create(Document& document)
@@ -74,13 +68,13 @@ void SVGEllipseElement::parseAttribute(const QualifiedName& name, const AtomicSt
     if (!isSupportedAttribute(name))
         SVGGeometryElement::parseAttribute(name, value);
     else if (name == SVGNames::cxAttr)
-        m_cx->setBaseValueAsString(value, AllowNegativeLengths, parseError);
+        m_cx->setBaseValueAsString(value, parseError);
     else if (name == SVGNames::cyAttr)
-        m_cy->setBaseValueAsString(value, AllowNegativeLengths, parseError);
+        m_cy->setBaseValueAsString(value, parseError);
     else if (name == SVGNames::rxAttr)
-        m_rx->setBaseValueAsString(value, ForbidNegativeLengths, parseError);
+        m_rx->setBaseValueAsString(value, parseError);
     else if (name == SVGNames::ryAttr)
-        m_ry->setBaseValueAsString(value, ForbidNegativeLengths, parseError);
+        m_ry->setBaseValueAsString(value, parseError);
     else
         ASSERT_NOT_REACHED();
 
@@ -94,7 +88,7 @@ void SVGEllipseElement::svgAttributeChanged(const QualifiedName& attrName)
         return;
     }
 
-    SVGElementInstance::InvalidationGuard invalidationGuard(this);
+    SVGElement::InvalidationGuard invalidationGuard(this);
 
     bool isLengthAttribute = attrName == SVGNames::cxAttr
                           || attrName == SVGNames::cyAttr