Make CSSCalcValue work with CSSParserTokenRange

Source/core/css/parser/CSSParserValues.h

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef CSSParserValues_h
 #define CSSParserValues_h
 
 #include "core/CSSValueKeywords.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSSelector.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/parser/CSSParserString.h"
+#include "core/css/parser/CSSParserTokenRange.h"
 
 namespace blink {
 
 class QualifiedName;
-class CSSParserTokenRange;
 
 struct CSSParserFunction;
+struct CSSParserCalcFunction;
 class CSSParserValueList;
 
 struct CSSParserValue {
     CSSValueID id;
     bool isInt;
     union {
         double fValue;
         int iValue;
         CSSParserString string;
         CSSParserFunction* function;
+        CSSParserCalcFunction* calcFunction;
         CSSParserValueList* valueList;
         struct {
             UChar32 start;
             UChar32 end;
         } m_unicodeRange;
     };
     enum {
         Operator  = 0x100000,
         Function  = 0x100001,
-        ValueList = 0x100002,
+        CalcFunction  = 0x100002,
+        ValueList = 0x100003,
         HexColor = 0x100004,
         // Represents a dimension by a list of two values, a CSS_NUMBER and an CSS_IDENT
         DimensionList = 0x100006,
         // Represents a unicode range by a pair of UChar32 values
         UnicodeRange = 0x100007,
     };
     int unit;
 
     inline void setFromNumber(double value, int unit = CSSPrimitiveValue::CSS_NUMBER);
     inline void setFromOperator(UChar);
-    inline void setFromFunction(CSSParserFunction*);
     inline void setFromValueList(PassOwnPtr<CSSParserValueList>);
 };
 
 class CORE_EXPORT CSSParserValueList {
     WTF_MAKE_FAST_ALLOCATED(CSSParserValueList);
 public:
     CSSParserValueList()
         : m_current(0)
     {
     }
@@ skipping 30 matching lines @@
     Vector<CSSParserValue, 4> m_values;
 };
 
 struct CSSParserFunction {
     WTF_MAKE_FAST_ALLOCATED(CSSParserFunction);
 public:
     CSSValueID id;
     OwnPtr<CSSParserValueList> args;
 };
 
+struct CSSParserCalcFunction {
+    WTF_MAKE_FAST_ALLOCATED(CSSParserCalcFunction);
+public:
+    Vector<CSSParserToken> args;

[Timothy Loh, 2015/07/21 07:33:17]

Just use a CSSParserTokenRange

[rwlbuis, 2015/07/22 02:19:06]

Done.
Note that I did it this way for the auto closing.

+};
+
 class CSSParserSelector {
     WTF_MAKE_NONCOPYABLE(CSSParserSelector); WTF_MAKE_FAST_ALLOCATED(CSSParserSelector);
 public:
     CSSParserSelector();
     explicit CSSParserSelector(const QualifiedName&, bool isImplicit = false);
 
     static PassOwnPtr<CSSParserSelector> create() { return adoptPtr(new CSSParserSelector); }
     static PassOwnPtr<CSSParserSelector> create(const QualifiedName& name, bool isImplicit = false) { return adoptPtr(new CSSParserSelector(name, isImplicit)); }
 
     ~CSSParserSelector();
@@ skipping 52 matching lines @@
 }
 
 inline void CSSParserValue::setFromOperator(UChar c)
 {
     id = CSSValueInvalid;
     unit = Operator;
     iValue = c;
     isInt = false;
 }
 
-inline void CSSParserValue::setFromFunction(CSSParserFunction* function)
-{
-    id = CSSValueInvalid;
-    this->function = function;
-    unit = Function;
-    isInt = false;
-}
-
 inline void CSSParserValue::setFromValueList(PassOwnPtr<CSSParserValueList> valueList)
 {
     id = CSSValueInvalid;
     this->valueList = valueList.leakPtr();
     unit = ValueList;
     isInt = false;
 }
 
 }
 
 #endif