Added support of calc() for SVGLength

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/CSSStringValue.h"
 #include "core/css/CSSValuePair.h"
@@ skipping 204 matching lines @@
 }
 
 CSSPrimitiveValue* consumeLengthOrPercent(CSSParserTokenRange& range, CSSParserMode cssParserMode, ValueRange valueRange, UnitlessQuirk unitless)
 {
     const CSSParserToken& token = range.peek();
     if (token.type() == DimensionToken || token.type() == NumberToken)
         return consumeLength(range, cssParserMode, valueRange, unitless);
     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, and keep the function looking
similar to before.

[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;
 }
 
 CSSPrimitiveValue* consumeAngle(CSSParserTokenRange& range)
 {
     const CSSParserToken& token = range.peek();
     if (token.type() == DimensionToken) {
         switch (token.unitType()) {
         case CSSPrimitiveValue::UnitType::Degrees:
@@ skipping 354 matching lines @@
     if (!value2) {
         positionFromOneValue(value1, resultX, resultY);
         return true;
     }
     return positionFromTwoValues(value1, value2, resultX, resultY);
 }
 
 } // namespace CSSPropertyParserHelpers
 
 } // namespace blink