Devirtualize animatedLocalTransform() and rename it for clarity

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 104 matching lines @@
 PassRefPtr<SVGMatrixTearOff> SVGGraphicsElement::getCTMFromJavascript()
 {
     return SVGMatrixTearOff::create(getCTM());
 }
 
 PassRefPtr<SVGMatrixTearOff> SVGGraphicsElement::getScreenCTMFromJavascript()
 {
     return SVGMatrixTearOff::create(getScreenCTM());
 }
 
-AffineTransform SVGGraphicsElement::animatedLocalTransform() const
+AffineTransform SVGGraphicsElement::calculateAnimatedLocalTransform() const
 {
     AffineTransform matrix;
     RenderStyle* style = renderer() ? renderer()->style() : 0;
 
     // If CSS property was set, use that, otherwise fallback to attribute (if set).
     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);
+        // SVGTextElements need special handling for the text positioning code.
+        if (isSVGTextElement(this)) {
+            // Do not take into account SVG's zoom rules, transform-origin, or percentage values.
+            style->applyTransform(transform, IntSize(0, 0), RenderStyle::ExcludeTransformOrigin);
         } else {
-            style->applyTransform(transform, renderer()->objectBoundingBox());
+            // 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 (hasSVGRareData())
         return *svgRareData()->animateMotionTransform() * matrix;
@@ skipping 86 matching lines @@
 
 RenderObject* SVGGraphicsElement::createRenderer(RenderStyle*)
 {
     // By default, any subclass is expected to do path-based drawing
     return new RenderSVGPath(this);
 }
 
 void SVGGraphicsElement::toClipPath(Path& path)
 {
     updatePathFromGraphicsElement(this, path);
-    // FIXME: How do we know the element has done a layout?
-    path.transform(animatedLocalTransform());
+    path.transform(calculateAnimatedLocalTransform());
 }
 
 }