[SVG2] Make transform, gradientTransform and patternTransform presentation attributes.

Source/core/svg/SVGPatternElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * 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.
  *
@@ skipping 39 matching lines @@
     addToPropertyMap(m_y);
     addToPropertyMap(m_width);
     addToPropertyMap(m_height);
     addToPropertyMap(m_patternTransform);
     addToPropertyMap(m_patternUnits);
     addToPropertyMap(m_patternContentUnits);
 }
 
 DEFINE_NODE_FACTORY(SVGPatternElement)
 
+bool SVGPatternElement::isPresentationAttribute(const QualifiedName& name) const
+{
+    if (name == SVGNames::patternTransformAttr)
+        return true;
+    return SVGElement::isPresentationAttribute(name);
+}
+
+void SVGPatternElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
+{
+    if (name == SVGNames::patternTransformAttr)
+        addPropertyToPresentationAttributeStyle(style, CSSPropertyTransform, value);
+    else
+        SVGElement::collectStyleForPresentationAttribute(name, value, style);
+}
+
 bool SVGPatternElement::isSupportedAttribute(const QualifiedName& attrName)
 {
     DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
     if (supportedAttributes.isEmpty()) {
         SVGURIReference::addSupportedAttributes(supportedAttributes);
         SVGTests::addSupportedAttributes(supportedAttributes);
         SVGFitToViewBox::addSupportedAttributes(supportedAttributes);
         supportedAttributes.add(SVGNames::patternUnitsAttr);
         supportedAttributes.add(SVGNames::patternContentUnitsAttr);
         supportedAttributes.add(SVGNames::patternTransformAttr);
@@ skipping 35 matching lines @@
     reportAttributeParsingError(parseError, name, value);
 }
 
 void SVGPatternElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     if (!isSupportedAttribute(attrName)) {
         SVGElement::svgAttributeChanged(attrName);
         return;
     }
 
+    if (attrName == SVGNames::patternTransformAttr) {
+        invalidateSVGPresentationAttributeStyle();
+        setNeedsStyleRecalc(LocalStyleChange);
+    }
+
     SVGElement::InvalidationGuard invalidationGuard(this);
 
     if (attrName == SVGNames::xAttr
         || attrName == SVGNames::yAttr
         || attrName == SVGNames::widthAttr
         || attrName == SVGNames::heightAttr)
         updateRelativeLengthsInformation();
 
     RenderSVGResourceContainer* renderer = toRenderSVGResourceContainer(this->renderer());
     if (renderer)
@@ skipping 35 matching lines @@
 
     if (!attributes.hasPreserveAspectRatio() && element->preserveAspectRatio()->isSpecified())
         attributes.setPreserveAspectRatio(element->preserveAspectRatio()->currentValue());
 
     if (!attributes.hasPatternUnits() && element->patternUnits()->isSpecified())
         attributes.setPatternUnits(element->patternUnits()->currentValue()->enumValue());
 
     if (!attributes.hasPatternContentUnits() && element->patternContentUnits()->isSpecified())
         attributes.setPatternContentUnits(element->patternContentUnits()->currentValue()->enumValue());
 
-    if (!attributes.hasPatternTransform() && element->patternTransform()->isSpecified()) {
+    if (!attributes.hasPatternTransform()) {
         AffineTransform transform;
-        element->patternTransform()->currentValue()->concatenate(transform);
-        attributes.setPatternTransform(transform);
+        bool hasTransform = element->getStyleTransform(transform);
+
+        // If CSS property was set, use that, otherwise fallback to attribute (if set).
+        if (!hasTransform && element->patternTransform()->isSpecified()) {
+            element->patternTransform()->currentValue()->concatenate(transform);
+            hasTransform = true;
+        }
+
+        if (hasTransform)
+            attributes.setPatternTransform(transform);
     }
 
     if (!attributes.hasPatternContentElement() && ElementTraversal::firstWithin(*element))
         attributes.setPatternContentElement(element);
 }
 
 void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes) const
 {
     WillBeHeapHashSet<RawPtrWillBeMember<const SVGPatternElement> > processedPatterns;
     const SVGPatternElement* current = this;
@@ skipping 27 matching lines @@
 
 bool SVGPatternElement::selfHasRelativeLengths() const
 {
     return m_x->currentValue()->isRelative()
         || m_y->currentValue()->isRelative()
         || m_width->currentValue()->isRelative()
         || m_height->currentValue()->isRelative();
 }
 
 }