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

Source/core/svg/SVGRectElement.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 59 matching lines @@
     return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName);
 }
 
 void SVGRectElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
     parseAttributeNew(name, value);
 }
 
 bool SVGRectElement::isPresentationAttribute(const QualifiedName& attrName) const
 {
-    if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr)
+    if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr
+        || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr)
         return true;
     return SVGGeometryElement::isPresentationAttribute(attrName);
 }
 
 bool SVGRectElement::isPresentationAttributeWithSVGDOM(const QualifiedName& attrName) const
 {
-    if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr)
+    if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr
+        || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr)
         return true;
     return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName);
 }
 
 void SVGRectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
 {
     RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute(name);
     if (property == m_x)
         addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyX, *m_x->currentValue());
     else if (property == m_y)
         addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyY, *m_y->currentValue());
+    else 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 SVGRectElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     if (!isSupportedAttribute(attrName)) {
         SVGGeometryElement::svgAttributeChanged(attrName);
         return;
     }
 
     SVGElement::InvalidationGuard invalidationGuard(this);
 
-    bool isLengthAttributeXY =
+    bool isPresentationLengthAttribute =
         attrName == SVGNames::xAttr
-        || attrName == SVGNames::yAttr;
-    if (isLengthAttributeXY) {
+        || attrName == SVGNames::yAttr
+        || attrName == SVGNames::rxAttr
+        || attrName == SVGNames::ryAttr;
+    if (isPresentationLengthAttribute) {
         invalidateSVGPresentationAttributeStyle();
         setNeedsStyleRecalc(LocalStyleChange,
             StyleChangeReasonForTracing::fromAttribute(attrName));
     }
 
-    bool isLengthAttribute = isLengthAttributeXY
-                          || attrName == SVGNames::widthAttr
-                          || attrName == SVGNames::heightAttr
-                          || attrName == SVGNames::rxAttr
-                          || attrName == SVGNames::ryAttr;
+    bool isLengthAttribute = isPresentationLengthAttribute
+        || attrName == SVGNames::widthAttr
+        || attrName == SVGNames::heightAttr;
 
     if (isLengthAttribute)
         updateRelativeLengthsInformation();
 
     LayoutSVGShape* renderer = toLayoutSVGShape(this->renderer());
     if (!renderer)
         return;
 
     if (isLengthAttribute) {
         renderer->setNeedsShapeUpdate();
@@ skipping 13 matching lines @@
         || m_rx->currentValue()->isRelative()
         || m_ry->currentValue()->isRelative();
 }
 
 LayoutObject* SVGRectElement::createRenderer(const LayoutStyle&)
 {
     return new LayoutSVGRect(this);
 }
 
 } // namespace blink