Move zoom handling for x and y properties to svg

Source/core/svg/SVGLengthContext.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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 78 matching lines @@
     ASSERT(type != SVGUnitTypes::SVG_UNIT_TYPE_UNKNOWN);
     if (type == SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE) {
         SVGLengthContext lengthContext(context);
         return x.value(lengthContext);
     }
 
     // FIXME: valueAsPercentage() won't be correct for eg. cm units. They need to be resolved in user space and then be considered in objectBoundingBox space.
     return x.valueAsPercentage();
 }
 
-float SVGLengthContext::valueForLength(const Length& length, SVGLengthMode mode) const
+static inline LayoutStyle* layoutStyleForLengthResolving(const SVGElement* context)

[fs, 2015/02/25 13:43:11]

Please restore this to where it originally was. (Avoids disturbing the actual
diff.)

[Erik Dahlström (inactive), 2015/02/25 13:54:50]

Done.

 {
+    if (!context)
+        return 0;
+
+    const ContainerNode* currentContext = context;
+    do {
+        if (currentContext->renderer())
+            return currentContext->renderer()->style();
+        currentContext = currentContext->parentNode();
+    } while (currentContext);
+
+    // There must be at least a LayoutSVGRoot renderer, carrying a style.
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
+float SVGLengthContext::valueForLength(const Length& length, const LayoutStyle& style, SVGLengthMode mode) const
+{
+    return valueForLengthWithZoom(length, style.effectiveZoom(), mode);
+}
+
+float SVGLengthContext::valueForLengthWithZoom(const Length& length, float zoom, SVGLengthMode mode) const
+{
+    ASSERT(zoom != 0);
     float dimension = 0;
     if (length.isPercent()) {
         FloatSize viewportSize;
         determineViewport(viewportSize);
-        dimension = dimensionForLengthMode(mode, viewportSize);
+        // The viewport will be unaffected by zoom.
+        dimension = dimensionForLengthMode(mode, viewportSize) * zoom;
     }
-    return floatValueForLength(length, dimension);
+    return floatValueForLength(length, dimension) / zoom;
 }
 
 float SVGLengthContext::convertValueToUserUnits(float value, SVGLengthMode mode, SVGLengthType fromUnit) const
 {
     switch (fromUnit) {
     case LengthTypeUnknown:
         return 0;
     case LengthTypeNumber:
         return value;
     case LengthTypePX:
@@ skipping 54 matching lines @@
     case LengthTypePT:
         return value / cssPixelsPerPoint;
     case LengthTypePC:
         return value / cssPixelsPerPica;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
-static inline LayoutStyle* layoutStyleForLengthResolving(const SVGElement* context)
-{
-    if (!context)
-        return 0;
-
-    const ContainerNode* currentContext = context;
-    do {
-        if (currentContext->renderer())
-            return currentContext->renderer()->style();
-        currentContext = currentContext->parentNode();
-    } while (currentContext);
-
-    // There must be at least a LayoutSVGRoot renderer, carrying a style.
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
 float SVGLengthContext::convertValueFromUserUnitsToEMS(float value) const
 {
     LayoutStyle* style = layoutStyleForLengthResolving(m_context);
     if (!style)
         return 0;
 
     float fontSize = style->specifiedFontSize();
     if (!fontSize)
         return 0;
 
@@ skipping 52 matching lines @@
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }