[svg2] Make 'x' and 'y' 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 57 matching lines @@
         supportedAttributes.add(SVGNames::ryAttr);
     }
     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)
+        return true;
+    return SVGGeometryElement::isPresentationAttribute(attrName);
+}
+
+void SVGRectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
+{
+    RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute(name);
+    if (property == m_x) {
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyX, m_x->currentValue()->valueInSpecifiedUnits(), m_x->currentValue()->cssUnitTypeQuirk());
+    } else if (property == m_y) {
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyY, m_y->currentValue()->valueInSpecifiedUnits(), m_y->currentValue()->cssUnitTypeQuirk());
+    } else if (!property) {

[fs, 2015/02/04 13:24:53]

Why the condition here?

(Also, could drop the {}'s in this if-cascade.)

[Erik Dahlström (inactive), 2015/02/05 16:09:02]

Just a remnant from early testing, shouldn't be necessary.
Done.

+        SVGGeometryElement::collectStyleForPresentationAttribute(name, value, style);
+    }
+}
+
 void SVGRectElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     if (!isSupportedAttribute(attrName)) {
         SVGGeometryElement::svgAttributeChanged(attrName);
         return;
     }
 
     SVGElement::InvalidationGuard invalidationGuard(this);
 
-    bool isLengthAttribute = attrName == SVGNames::xAttr
-                          || attrName == SVGNames::yAttr
+    bool isLengthAttributeXY =
+        attrName == SVGNames::xAttr
+        || attrName == SVGNames::yAttr;
+    if (isLengthAttributeXY) {
+        invalidateSVGPresentationAttributeStyle();
+        setNeedsStyleRecalc(LocalStyleChange,
+            StyleChangeReasonForTracing::fromAttribute(attrName));
+    }
+
+    bool isLengthAttribute = isLengthAttributeXY
                           || attrName == SVGNames::widthAttr
                           || attrName == SVGNames::heightAttr
                           || attrName == SVGNames::rxAttr
                           || attrName == SVGNames::ryAttr;
 
     if (isLengthAttribute)
         updateRelativeLengthsInformation();
 
     RenderSVGShape* renderer = toRenderSVGShape(this->renderer());
     if (!renderer)
@@ skipping 17 matching lines @@
         || m_rx->currentValue()->isRelative()
         || m_ry->currentValue()->isRelative();
 }
 
 RenderObject* SVGRectElement::createRenderer(RenderStyle*)
 {
     return new RenderSVGRect(this);
 }
 
 } // namespace blink