Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp |
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp |
index bc5add7bbd2976607aff81c7cadeb0fe2056f918..2aaabdc236ff801477cdf1133a6b3c2984a4569f 100644 |
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp |
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp |
@@ -486,14 +486,22 @@ static bool parseHexColor(CSSParserTokenRange& range, |
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; |