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 b4e834106660a9cb4b98eda4312a4ca50f1b1f57..3db0f904272fa2bdb3ecfb6a75f91699a905d1f4 100644 |
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp |
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp |
@@ -222,9 +222,23 @@ CSSPrimitiveValue* consumeLengthOrPercent(CSSParserTokenRange& range, CSSParserM |
if (token.type() == PercentageToken) |
return consumePercent(range, valueRange); |
CalcParser calcParser(range, valueRange); |
+ |
if (const CSSCalcValue* calculation = calcParser.value()) { |
- if (calculation->category() == CalcLength || calculation->category() == CalcPercent || calculation->category() == CalcPercentLength) |
+ switch (calculation->category()) { |
fs
2016/06/29 09:28:17
Maybe move this to a helper (predicate) function,
Shanmuga Pandi
2016/07/15 12:18:22
Done.
|
+ case CalcLength: |
+ case CalcPercent: |
+ case CalcPercentLength: |
return calcParser.consumeValue(); |
+ case CalcNumber: |
+ case CalcPercentNumber: |
+ case CalcLengthNumber: |
+ case CalcPercentLengthNumber: |
+ if (cssParserMode == SVGAttributeMode) |
+ return calcParser.consumeValue(); |
+ break; |
+ default: |
+ break; |
+ } |
} |
return nullptr; |
} |