Simplify SVGLengthContext::valueForLength

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)
+float SVGLengthContext::valueForLength(const Length& length, SVGLengthMode mode) const
 {
-    if (length.isAuto())
-        return 0;
-
-    FloatSize viewportSize;
-    determineViewport(viewportSize);
-
-    if (length.isPercent())
-        return length.value() * dimensionForLengthMode(mode, viewportSize) / 100;
-
-    return floatValueForLength(length, dimensionForLengthMode(mode, viewportSize));
+    float dimension = 0;
+    if (length.isPercent()) {
+        FloatSize viewportSize;
+        determineViewport(viewportSize);
+        dimension = dimensionForLengthMode(mode, viewportSize);
+    }
+    return floatValueForLength(length, dimension);
 }
 
 float SVGLengthContext::convertValueToUserUnits(float value, SVGLengthMode mode, SVGLengthType fromUnit) const
 {
     switch (fromUnit) {
     case LengthTypeUnknown:
         return 0;
     case LengthTypeNumber:
         return value;
     case LengthTypePX:
@@ skipping 143 matching lines @@
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }