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

Source/core/svg/SVGGraphicsElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2014 Google, Inc.
  *
  * 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 25 matching lines @@
     , SVGTests(this)
     , m_transform(SVGAnimatedTransformList::create(this, SVGNames::transformAttr, SVGTransformList::create()))
 {
     addToPropertyMap(m_transform);
 }
 
 SVGGraphicsElement::~SVGGraphicsElement()
 {
 }
 
-bool SVGGraphicsElement::isPresentationAttribute(const QualifiedName& name) const
-{
-    if (name == SVGNames::transformAttr)
-        return true;
-    return SVGElement::isPresentationAttribute(name);
-}
-
-void SVGGraphicsElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
-{
-    if (name == SVGNames::transformAttr)
-        addPropertyToPresentationAttributeStyle(style, CSSPropertyTransform, value);
-    else
-        SVGElement::collectStyleForPresentationAttribute(name, value, style);
-}
-
 PassRefPtr<SVGMatrixTearOff> SVGGraphicsElement::getTransformToElement(SVGElement* target, ExceptionState& exceptionState)
 {
     AffineTransform ctm = getCTM(AllowStyleUpdate);
 
     if (target && target->isSVGGraphicsElement()) {
         AffineTransform targetCTM = toSVGGraphicsElement(target)->getCTM(AllowStyleUpdate);
         if (!targetCTM.isInvertible()) {
             exceptionState.throwDOMException(InvalidStateError, "The target transformation is not invertable.");
             return nullptr;
         }
@@ skipping 61 matching lines @@
 }
 
 PassRefPtr<SVGMatrixTearOff> SVGGraphicsElement::getScreenCTMFromJavascript()
 {
     return SVGMatrixTearOff::create(getScreenCTM());
 }
 
 AffineTransform SVGGraphicsElement::animatedLocalTransform() const
 {
     AffineTransform matrix;
+    RenderStyle* style = renderer() ? renderer()->style() : 0;
+
     // If CSS property was set, use that, otherwise fallback to attribute (if set).
-    if (!getStyleTransform(matrix))
+    if (style && style->hasTransform()) {
+        TransformationMatrix transform;
+        float zoom = style->effectiveZoom();
+
+        // CSS transforms operate with pre-scaled lengths. To make this work with SVG
+        // (which applies the zoom factor globally, at the root level) we
+        //
+        //   * pre-scale the bounding box (to bring it into the same space as the other CSS values)
+        //   * invert the zoom factor (to effectively compute the CSS transform under a 1.0 zoom)
+        //
+        // Note: objectBoundingBox is an emptyRect for elements like pattern or clipPath.
+        // See the "Object bounding box units" section of http://dev.w3.org/csswg/css3-transforms/
+        if (zoom != 1) {
+            FloatRect scaledBBox = renderer()->objectBoundingBox();
+            scaledBBox.scale(zoom);
+            transform.scale(1 / zoom);
+            style->applyTransform(transform, scaledBBox);
+            transform.scale(zoom);
+        } else {
+            style->applyTransform(transform, renderer()->objectBoundingBox());
+        }
+
+        // Flatten any 3D transform.
+        matrix = transform.toAffineTransform();
+    } else {
         m_transform->currentValue()->concatenate(matrix);
+    }
 
     if (m_supplementalTransform)
         return *m_supplementalTransform * matrix;
     return matrix;
 }
 
 AffineTransform* SVGGraphicsElement::supplementalTransform()
 {
     if (!m_supplementalTransform)
         m_supplementalTransform = adoptPtr(new AffineTransform);
@@ skipping 28 matching lines @@
     if (SVGTests::isKnownAttribute(attrName)) {
         lazyReattachIfAttached();
         return;
     }
 
     RenderObject* object = renderer();
     if (!object)
         return;
 
     if (attrName == SVGNames::transformAttr) {
-        invalidateSVGPresentationAttributeStyle();
-        setNeedsStyleRecalc(LocalStyleChange);
         object->setNeedsTransformUpdate();
         RenderSVGResource::markForLayoutAndParentResourceInvalidation(object);
         return;
     }
 
     ASSERT_NOT_REACHED();
 }
 
 SVGElement* SVGGraphicsElement::nearestViewportElement() const
 {
@@ skipping 38 matching lines @@
 }
 
 void SVGGraphicsElement::toClipPath(Path& path)
 {
     updatePathFromGraphicsElement(this, path);
     // FIXME: How do we know the element has done a layout?
     path.transform(animatedLocalTransform());
 }
 
 }