Fold up the SVGLengthContext::convertValueFrom* helpers

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 13 matching lines @@
 #include "core/svg/SVGLengthContext.h"
 
 #include "core/css/CSSHelper.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/style/LayoutStyle.h"
 #include "core/svg/SVGSVGElement.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;
+}
+
+static float convertValueFromPercentageToUserUnits(const SVGLength& value, const FloatSize& viewportSize)
+{
+    return value.scaleByPercentage(dimensionForLengthMode(value.unitMode(), viewportSize));
+}
+
 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 48 matching lines @@
     case LengthTypeUnknown:
         return 0;
     case LengthTypeNumber:
         return value;
     case LengthTypePX:
         return value;
     case LengthTypePercentage: {
         FloatSize viewportSize;
         if (!determineViewport(viewportSize))
             return 0;
-        return convertValueFromPercentageToUserUnits(value, mode, viewportSize) / 100;
+        return value * dimensionForLengthMode(mode, viewportSize) / 100;
     }
     case LengthTypeEMS:
         return convertValueFromEMSToUserUnits(value);
     case LengthTypeEXS:
         return convertValueFromEXSToUserUnits(value);
     case LengthTypeCM:
         return value * cssPixelsPerCentimeter;
     case LengthTypeMM:
         return value * cssPixelsPerMillimeter;
     case LengthTypeIN:
@@ skipping 12 matching lines @@
 {
     switch (toUnit) {
     case LengthTypeUnknown:
         return 0;
     case LengthTypeNumber:
         return value;
     case LengthTypePercentage: {
         FloatSize viewportSize;
         if (!determineViewport(viewportSize))
             return 0;
-        return convertValueFromUserUnitsToPercentage(value * 100, mode, viewportSize);
+        // LengthTypePercentage is represented with 100% = 100.0.
+        // Good for accuracy but could eventually be changed.
+        return value * 100 / dimensionForLengthMode(mode, viewportSize);
     }
     case LengthTypeEMS:
         return convertValueFromUserUnitsToEMS(value);
     case LengthTypeEXS:
         return convertValueFromUserUnitsToEXS(value);
     case LengthTypePX:
         return value;
     case LengthTypeCM:
         return value / cssPixelsPerCentimeter;
     case LengthTypeMM:
         return value / cssPixelsPerMillimeter;
     case LengthTypeIN:
         return value / cssPixelsPerInch;
     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, const FloatSize& viewportSize)
-{
-    return value / dimensionForLengthMode(mode, viewportSize) * 100;
-}
-
-float SVGLengthContext::convertValueFromPercentageToUserUnits(float value, SVGLengthMode mode, const FloatSize& viewportSize)
-{
-    return value * dimensionForLengthMode(mode, viewportSize);
-}
-
-float SVGLengthContext::convertValueFromPercentageToUserUnits(const SVGLength& value, const FloatSize& viewportSize)
-{
-    return value.scaleByPercentage(dimensionForLengthMode(value.unitMode(), viewportSize));
-}
-
 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();
@@ skipping 69 matching lines @@
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }