Add toSVGLengthType() and toSVGLengthMode() fuctions, and use it.

Source/core/svg/SVGLength.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.
  *
  * 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 16 matching lines @@
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/svg/SVGParserUtilities.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
+static inline SVGLengthMode toSVGLengthMode(unsigned short mode)
+{
+    ASSERT(mode >= LengthModeWidth && mode <= LengthModeOther);
+    return static_cast<SVGLengthMode>(mode);
+}
+
+static inline SVGLengthType toSVGLengthType(unsigned short type)
+{
+    ASSERT(type >= LengthTypeUnknown && type <= LengthTypePC);
+    return static_cast<SVGLengthType>(type);
+}
+
 static inline unsigned int storeUnit(SVGLengthMode mode, SVGLengthType type)
 {
     return (mode << 4) | type;
 }
 
 static inline SVGLengthMode extractMode(unsigned int unit)
 {
     unsigned int mode = unit >> 4;
-    return static_cast<SVGLengthMode>(mode);
+    return toSVGLengthMode(mode);
 }
 
 static inline SVGLengthType extractType(unsigned int unit)
 {
     unsigned int mode = unit >> 4;
     unsigned int type = unit ^ (mode << 4);
-    return static_cast<SVGLengthType>(type);
+    return toSVGLengthType(type);
 }
 
 static inline String lengthTypeToString(SVGLengthType type)
 {
     switch (type) {
     case LengthTypeUnknown:
     case LengthTypeNumber:
         return "";
     case LengthTypePercentage:
         return "%";
@@ skipping 196 matching lines @@
     return String::number(m_valueInSpecifiedUnits) + lengthTypeToString(extractType(m_unit));
 }
 
 void SVGLength::newValueSpecifiedUnits(unsigned short type, float value, ExceptionState& es)
 {
     if (type == LengthTypeUnknown || type > LengthTypePC) {
         es.throwDOMException(NotSupportedError);
         return;
     }
 
-    m_unit = storeUnit(extractMode(m_unit), static_cast<SVGLengthType>(type));
+    m_unit = storeUnit(extractMode(m_unit), toSVGLengthType(type));
     m_valueInSpecifiedUnits = value;
 }
 
 void SVGLength::convertToSpecifiedUnits(unsigned short type, const SVGLengthContext& context, ExceptionState& es)
 {
     if (type == LengthTypeUnknown || type > LengthTypePC) {
         es.throwDOMException(NotSupportedError);
         return;
     }
 
     float valueInUserUnits = value(context, es);
     if (es.hadException())
         return;
 
     unsigned int originalUnitAndType = m_unit;
-    m_unit = storeUnit(extractMode(m_unit), static_cast<SVGLengthType>(type));
+    m_unit = storeUnit(extractMode(m_unit), toSVGLengthType(type));
     setValue(valueInUserUnits, context, es);
     if (!es.hadException())
         return;
 
     // Eventually restore old unit and type
     m_unit = originalUnitAndType;
 }
 
 SVGLength SVGLength::fromCSSPrimitiveValue(CSSPrimitiveValue* value)
 {
@@ skipping 119 matching lines @@
         s_lengthModeMap.set(SVGNames::startOffsetAttr, LengthModeWidth);
     }
 
     if (s_lengthModeMap.contains(attrName))
         return s_lengthModeMap.get(attrName);
 
     return LengthModeOther;
 }
 
 }