[svg2] Make 'x' and 'y' presentation attributes

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 14 matching lines @@
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/SVGNames.h"
 #include "core/css/CSSHelper.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/svg/RenderSVGRoot.h"
 #include "core/rendering/svg/RenderSVGViewportContainer.h"
 #include "core/svg/SVGSVGElement.h"
+#include "platform/LengthFunctions.h"
 #include "platform/fonts/FontMetrics.h"
 
 namespace blink {
 
+static inline float dimensionForLengthMode(SVGLengthMode mode, const FloatSize& viewportSize)
+{
+    switch (mode) {
+    case LengthModeWidth:
+        return viewportSize.width();
+    case LengthModeHeight:
+        return viewportSize.height();
+    case LengthModeOther:
+        return sqrtf(viewportSize.diagonalLengthSquared() / 2);
+    }
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
 SVGLengthContext::SVGLengthContext(const SVGElement* context)
     : m_context(context)
 {
 }
 
 FloatRect SVGLengthContext::resolveRectangle(const SVGElement* context, SVGUnitTypes::SVGUnitType type, const FloatRect& viewport, PassRefPtrWillBeRawPtr<SVGLength> passX, PassRefPtrWillBeRawPtr<SVGLength> passY, PassRefPtrWillBeRawPtr<SVGLength> passWidth, PassRefPtrWillBeRawPtr<SVGLength> passHeight)
 {
     RefPtrWillBeRawPtr<SVGLength> x = passX;
     RefPtrWillBeRawPtr<SVGLength> y = passY;
     RefPtrWillBeRawPtr<SVGLength> width = passWidth;
@@ skipping 35 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)
+{
+    if (length.isAuto())
+        return 0;
+
+    FloatSize viewportSize;
+    determineViewport(viewportSize);
+
+    if (length.isPercent())
+        return convertValueFromPercentageToUserUnits(length.value(), mode, viewportSize) / 100;
+
+    return floatValueForLength(length, dimensionForLengthMode(mode, viewportSize));
+}
+
 float SVGLengthContext::convertValueToUserUnits(float value, SVGLengthMode mode, SVGLengthType fromUnit, ExceptionState& exceptionState) const
 {
     switch (fromUnit) {
     case LengthTypeUnknown:
         exceptionState.throwDOMException(NotSupportedError, ExceptionMessages::argumentNullOrIncorrectType(3, "SVGLengthType"));
         return 0;
     case LengthTypeNumber:
         return value;
     case LengthTypePX:
         return value;
@@ skipping 44 matching lines @@
     case LengthTypePT:
         return value / cssPixelsPerPoint;
     case LengthTypePC:
         return value / cssPixelsPerPica;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
-static inline float dimensionForLengthMode(SVGLengthMode mode, const FloatSize& viewportSize)
-{
-    switch (mode) {
-    case LengthModeWidth:
-        return viewportSize.width();
-    case LengthModeHeight:
-        return viewportSize.height();
-    case LengthModeOther:
-        return sqrtf(viewportSize.diagonalLengthSquared() / 2);
-    }
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
 float SVGLengthContext::convertValueFromUserUnitsToPercentage(float value, SVGLengthMode mode, ExceptionState& exceptionState) const
 {
     FloatSize viewportSize;
     if (!determineViewport(viewportSize)) {
         exceptionState.throwDOMException(NotSupportedError, "The viewport could not be determined.");
         return 0;
     }
 
     return value / dimensionForLengthMode(mode, viewportSize) * 100;
 }
@@ skipping 113 matching lines @@
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }