[svg2] Make 'rx' and 'ry' presentation attributes

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 49 matching lines @@
         supportedAttributes.add(SVGNames::ryAttr);
     }
     return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName);
 }
 
 void SVGEllipseElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
     parseAttributeNew(name, value);
 }
 
+bool SVGEllipseElement::isPresentationAttribute(const QualifiedName& attrName) const
+{
+    if (attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr)
+        return true;
+    return SVGGeometryElement::isPresentationAttribute(attrName);
+}
+
+bool SVGEllipseElement::isPresentationAttributeWithSVGDOM(const QualifiedName& attrName) const
+{
+    if (attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr)
+        return true;
+    return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName);
+}
+
+void SVGEllipseElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
+{
+    RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute(name);
+    if (property == m_rx)
+        addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyRx, *m_rx->currentValue());
+    else if (property == m_ry)
+        addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyRy, *m_ry->currentValue());
+    else
+        SVGGeometryElement::collectStyleForPresentationAttribute(name, value, style);
+}
+
+
 void SVGEllipseElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     if (!isSupportedAttribute(attrName)) {
         SVGGeometryElement::svgAttributeChanged(attrName);
         return;
     }
 
     SVGElement::InvalidationGuard invalidationGuard(this);
 
+    bool isPresentationLengthAttribute =
+        attrName == SVGNames::rxAttr
+        || attrName == SVGNames::ryAttr;
+    if (isPresentationLengthAttribute) {
+        invalidateSVGPresentationAttributeStyle();
+        setNeedsStyleRecalc(LocalStyleChange,
+            StyleChangeReasonForTracing::fromAttribute(attrName));
+    }
+
     bool isLengthAttribute = attrName == SVGNames::cxAttr
-                          || attrName == SVGNames::cyAttr
-                          || attrName == SVGNames::rxAttr
-                          || attrName == SVGNames::ryAttr;
+        || attrName == SVGNames::cyAttr
+        || isPresentationLengthAttribute;
 
     if (isLengthAttribute)
         updateRelativeLengthsInformation();
 
     LayoutSVGShape* renderer = toLayoutSVGShape(this->renderer());
     if (!renderer)
         return;
 
     if (isLengthAttribute) {
         renderer->setNeedsShapeUpdate();
@@ skipping 11 matching lines @@
         || m_rx->currentValue()->isRelative()
         || m_ry->currentValue()->isRelative();
 }
 
 LayoutObject* SVGEllipseElement::createRenderer(const LayoutStyle&)
 {
     return new LayoutSVGEllipse(this);
 }
 
 } // namespace blink