Remove all ordering requirements in CSSValueKeywords.in (WIP)

third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/parser/CSSPropertyParserHelpers.h"
 
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSColorValue.h"
 #include "core/css/CSSCrossfadeValue.h"
 #include "core/css/CSSGradientValue.h"
@@ skipping 468 matching lines @@
       return false;
     if (!Color::parseHexColor(color, result))
       return false;
   } else {
     return false;
   }
   range.consumeIncludingWhitespace();
   return true;
 }
 
+static bool isRGBFunctionId(CSSValueID functionId) {
+  return functionId == CSSValueRgb || functionId == CSSValueRgba;
+}
+
+static bool isHSLFunctionId(CSSValueID functionId) {
+  return functionId == CSSValueHsl || functionId == CSSValueHsla;
+}
+
 static bool parseColorFunction(CSSParserTokenRange& range, RGBA32& result) {
   CSSValueID functionId = range.peek().functionId();
-  if (functionId < CSSValueRgb || functionId > CSSValueHsla)
+  if (!isRGBFunctionId(functionId) && !isHSLFunctionId(functionId))
     return false;
   CSSParserTokenRange colorRange = range;
-  if ((functionId <= CSSValueRgba &&
+  if ((isRGBFunctionId(functionId) &&
        !parseRGBParameters(colorRange, result, functionId == CSSValueRgba)) ||
-      (functionId >= CSSValueHsl &&
+      (isHSLFunctionId(functionId) &&
        !parseHSLParameters(colorRange, result, functionId == CSSValueHsla)))
     return false;
   range = colorRange;
   return true;
 }
 
 CSSValue* consumeColor(CSSParserTokenRange& range,
                        CSSParserMode cssParserMode,
                        bool acceptQuirkyColors) {
   CSSValueID id = range.peek().id();
@@ skipping 723 matching lines @@
 
 // https://drafts.csswg.org/css-shapes-1/#typedef-shape-box
 CSSIdentifierValue* consumeShapeBox(CSSParserTokenRange& range) {
   return consumeIdent<CSSValueContentBox, CSSValuePaddingBox, CSSValueBorderBox,
                       CSSValueMarginBox>(range);
 }
 
 }  // namespace CSSPropertyParserHelpers
 
 }  // namespace blink