Store CSSPropertyID in SVGAnimatedPropertyBase

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  *
  * 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,
@@ skipping 12 matching lines @@
 #include "core/dom/StyleChangeReason.h"
 #include "core/layout/svg/LayoutSVGEllipse.h"
 #include "core/svg/SVGLength.h"
 
 namespace blink {
 
 inline SVGEllipseElement::SVGEllipseElement(Document& document)
     : SVGGeometryElement(SVGNames::ellipseTag, document),
       m_cx(SVGAnimatedLength::create(this,
                                      SVGNames::cxAttr,
-                                     SVGLength::create(SVGLengthMode::Width))),
+                                     SVGLength::create(SVGLengthMode::Width),
+                                     CSSPropertyCx)),
       m_cy(SVGAnimatedLength::create(this,
                                      SVGNames::cyAttr,
-                                     SVGLength::create(SVGLengthMode::Height))),
+                                     SVGLength::create(SVGLengthMode::Height),
+                                     CSSPropertyCy)),
       m_rx(SVGAnimatedLength::create(this,
                                      SVGNames::rxAttr,
-                                     SVGLength::create(SVGLengthMode::Width))),
-      m_ry(
-          SVGAnimatedLength::create(this,
-                                    SVGNames::ryAttr,
-                                    SVGLength::create(SVGLengthMode::Height))) {
+                                     SVGLength::create(SVGLengthMode::Width),
+                                     CSSPropertyRx)),
+      m_ry(SVGAnimatedLength::create(this,
+                                     SVGNames::ryAttr,
+                                     SVGLength::create(SVGLengthMode::Height),
+                                     CSSPropertyRy)) {
   addToPropertyMap(m_cx);
   addToPropertyMap(m_cy);
   addToPropertyMap(m_rx);
   addToPropertyMap(m_ry);
 }
 
 DEFINE_TRACE(SVGEllipseElement) {
   visitor->trace(m_cx);
   visitor->trace(m_cy);
   visitor->trace(m_rx);
@@ skipping 26 matching lines @@
       lengthContext.valueForLength(svgStyle.cx(), style, SVGLengthMode::Width) -
           rx,
       lengthContext.valueForLength(svgStyle.cy(), style,
                                    SVGLengthMode::Height) -
           ry,
       rx * 2, ry * 2));
 
   return path;
 }
 
-bool SVGEllipseElement::isPresentationAttribute(
-    const QualifiedName& attrName) const {
-  if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr ||
-      attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr)
-    return true;
-  return SVGGeometryElement::isPresentationAttribute(attrName);
-}
-
-bool SVGEllipseElement::isPresentationAttributeWithSVGDOM(
-    const QualifiedName& attrName) const {
-  if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr ||
-      attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr)
-    return true;
-  return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName);
-}
-
 void SVGEllipseElement::collectStyleForPresentationAttribute(
     const QualifiedName& name,
     const AtomicString& value,
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_cx)
     addPropertyToPresentationAttributeStyle(
         style, CSSPropertyCx, m_cx->currentValue()->asCSSPrimitiveValue());
   else if (property == m_cy)
     addPropertyToPresentationAttributeStyle(
@@ skipping 36 matching lines @@
          m_cy->currentValue()->isRelative() ||
          m_rx->currentValue()->isRelative() ||
          m_ry->currentValue()->isRelative();
 }
 
 LayoutObject* SVGEllipseElement::createLayoutObject(const ComputedStyle&) {
   return new LayoutSVGEllipse(this);
 }
 
 }  // namespace blink