Remove all ordering requirements in CSSValueKeywords.in (WIP)

third_party/WebKit/Source/core/css/FontSize.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 33 matching lines @@
       float zoomFactor,
       bool isAbsoluteSize,
       float specifiedSize,
       ESmartMinimumForFontSize = UseSmartMinimumForFontSize);
 
   // Given a CSS keyword in the range (xx-small to -webkit-xxx-large), this
   // function returns
   // values from '1' to '8'.
   static unsigned keywordSize(CSSValueID valueID) {
     ASSERT(isValidValueID(valueID));
-    return valueID - CSSValueXxSmall + 1;
+    switch (valueID) {
+      case CSSValueXxSmall:
+        return 1;
+      case CSSValueXSmall:
+        return 2;
+      case CSSValueSmall:
+        return 3;
+      case CSSValueMedium:
+        return 4;
+      case CSSValueLarge:
+        return 5;
+      case CSSValueXLarge:
+        return 6;
+      case CSSValueXxLarge:
+        return 7;
+      case CSSValueWebkitXxxLarge:
+        return 8;
+      default:
+        NOTREACHED();
+        return 1;
+    }
   }
 
   static bool isValidValueID(CSSValueID valueID) {
-    return valueID >= CSSValueXxSmall && valueID <= CSSValueWebkitXxxLarge;
+    return valueID == CSSValueXxSmall || valueID == CSSValueXSmall || valueID == CSSValueSmall || valueID == CSSValueMedium || valueID == CSSValueLarge || valueID == CSSValueXLarge || valueID == CSSValueXxLarge || valueID == CSSValueWebkitXxxLarge;
   }
 
   static CSSValueID initialValueID() { return CSSValueMedium; }
   static unsigned initialKeywordSize() { return keywordSize(initialValueID()); }
 
   // Given a keyword size in the range (1 to 8), this function will return
   // the correct font size scaled relative to the user's default (4).
   static float fontSizeForKeyword(const Document*,
                                   unsigned keyword,
                                   bool isMonospace);
 
   // Given a font size in pixel, this function will return legacy font size
   // between 1 and 7.
   static int legacyFontSize(const Document*,
                             int pixelFontSize,
                             bool isMonospace);
 };
 
 }  // namespace blink
 
 #endif  // FontSize_h