Refactor LengthMode handling in SVGLengthContext

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 137 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;
     }
 
-    switch (mode) {
-    case LengthModeWidth:
-        return value / viewportSize.width() * 100;
-    case LengthModeHeight:
-        return value / viewportSize.height() * 100;
-    case LengthModeOther:
-        return value / sqrtf(viewportSize.diagonalLengthSquared() / 2) * 100;
-    };
-
-    ASSERT_NOT_REACHED();
-    return 0;
+    return value / dimensionForLengthMode(mode, viewportSize) * 100;
 }
 
 float SVGLengthContext::convertValueFromPercentageToUserUnits(float value, SVGLengthMode mode, ExceptionState& exceptionState) const
 {
     FloatSize viewportSize;
     if (!determineViewport(viewportSize)) {
         exceptionState.throwDOMException(NotSupportedError, "The viewport could not be determined.");
         return 0;
     }
     return convertValueFromPercentageToUserUnits(value, mode, viewportSize);
 }
 
 float SVGLengthContext::convertValueFromPercentageToUserUnits(float value, SVGLengthMode mode, const FloatSize& viewportSize)
 {
-    switch (mode) {
-    case LengthModeWidth:
-        return value * viewportSize.width();
-    case LengthModeHeight:
-        return value * viewportSize.height();
-    case LengthModeOther:
-        return value * sqrtf(viewportSize.diagonalLengthSquared() / 2);
-    }
-
-    ASSERT_NOT_REACHED();
-    return 0;
+    return value * dimensionForLengthMode(mode, viewportSize);
 }
 
 float SVGLengthContext::convertValueFromPercentageToUserUnits(const SVGLength& value, const FloatSize& viewportSize)
 {
-    switch (value.unitMode()) {
-    case LengthModeWidth:
-        return value.scaleByPercentage(viewportSize.width());
-    case LengthModeHeight:
-        return value.scaleByPercentage(viewportSize.height());
-    case LengthModeOther:
-        return value.scaleByPercentage(sqrtf(viewportSize.diagonalLengthSquared() / 2));
-    }
-
-    ASSERT_NOT_REACHED();
-    return 0;
+    return value.scaleByPercentage(dimensionForLengthMode(value.unitMode(), viewportSize));
 }
 
 static inline RenderStyle* renderStyleForLengthResolving(const SVGElement* context)
 {
     if (!context)
         return 0;
 
     const ContainerNode* currentContext = context;
     do {
         if (currentContext->renderer())
@@ skipping 84 matching lines @@
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }