Added support of calc() for SVGLength

third_party/WebKit/Source/core/svg/SVGLength.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 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 68 matching lines @@
 
 void SVGLength::setValue(float value, const SVGLengthContext& context)
 {
     m_value = CSSPrimitiveValue::create(
         context.convertValueFromUserUnits(value, unitMode(), m_value->typeWithCalcResolved()),
         m_value->typeWithCalcResolved());
 }
 
 bool isSupportedCSSUnitType(CSSPrimitiveValue::UnitType type)
 {
-    return (CSSPrimitiveValue::isLength(type) || type == CSSPrimitiveValue::UnitType::Number || type == CSSPrimitiveValue::UnitType::Percentage)
+    return (CSSPrimitiveValue::isLength(type) || type == CSSPrimitiveValue::UnitType::Number || type == CSSPrimitiveValue::UnitType::Percentage || (type >= CSSPrimitiveValue::UnitType::Calc && type <= CSSPrimitiveValue::UnitType::CalcPercentageWithLengthAndNumber))

[fs, 2016/06/29 09:28:17]

Suggest you reformat this function, to maybe make it more readable, by adding
some line-breaks (so at least the new part of the condition goes on a new line.
Feel free to reformat the old pat too though.)

[Shanmuga Pandi, 2016/07/15 12:18:22]

Done.

         && type != CSSPrimitiveValue::UnitType::QuirkyEms;
 }
 
 void SVGLength::setUnitType(CSSPrimitiveValue::UnitType type)
 {
     ASSERT(isSupportedCSSUnitType(type));
     m_value = CSSPrimitiveValue::create(m_value->getFloatValue(), type);
 }
 
 float SVGLength::valueAsPercentage() const
@@ skipping 32 matching lines @@
         m_value = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::UserUnits);
         return SVGParseStatus::NoError;
     }
 
     CSSParserContext svgParserContext(SVGAttributeMode, 0);
     CSSValue* parsed = CSSParser::parseSingleValue(CSSPropertyX, string, svgParserContext);
     if (!parsed || !parsed->isPrimitiveValue())
         return SVGParseStatus::ExpectedLength;
 
     CSSPrimitiveValue* newValue = toCSSPrimitiveValue(parsed);
-    // TODO(fs): Enable calc for SVG lengths
-    if (newValue->isCalculated() || !isSupportedCSSUnitType(newValue->typeWithCalcResolved()))
+    if (!isSupportedCSSUnitType(newValue->typeWithCalcResolved()))
         return SVGParseStatus::ExpectedLength;
 
     m_value = newValue;
     return SVGParseStatus::NoError;
 }
 
 String SVGLength::valueAsString() const
 {
     return m_value->customCSSText();
 }
@@ skipping 102 matching lines @@
 
 float SVGLength::calculateDistance(SVGPropertyBase* toValue, SVGElement* contextElement)
 {
     SVGLengthContext lengthContext(contextElement);
     SVGLength* toLength = toSVGLength(toValue);
 
     return fabsf(toLength->value(lengthContext) - value(lengthContext));
 }
 
 } // namespace blink