Change Counter to be a CSSValue

Source/core/css/CSSPrimitiveValue.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * 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 20 matching lines @@
 #include "wtf/Forward.h"
 #include "wtf/MathExtras.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 class CSSBasicShape;
 class CSSCalcValue;
 class CSSToLengthConversionData;
-class Counter;
 class Length;
 class LengthSize;
 class Pair;
 class Quad;
 class RGBColor;
 class Rect;
 class ComputedStyle;
 
 // Dimension calculations are imprecise, often resulting in values of e.g.
 // 44.99998. We need to go ahead and round if we're really close to the next
@@ skipping 36 matching lines @@
         Radians,
         Gradians,
         Turns,
         Milliseconds,
         Seconds,
         Hertz,
         Kilohertz,
         CustomIdentifier,
         URI,
         Attribute,
-        Counter,
         Rect,
         RGBColor,
         ViewportWidth,
         ViewportHeight,
         ViewportMin,
         ViewportMax,
         DotsPerPixel,
         DotsPerInch,
         DotsPerCentimeter,
         Fraction,
@@ skipping 52 matching lines @@
     static UnitType fromName(const String& unit);
 
     bool isAngle() const
     {
         return type() == UnitType::Degrees
             || type() == UnitType::Radians
             || type() == UnitType::Gradians
             || type() == UnitType::Turns;
     }
     bool isAttr() const { return type() == UnitType::Attribute; }
-    bool isCounter() const { return type() == UnitType::Counter; }
     bool isCustomIdent() const { return type() == UnitType::CustomIdentifier; }
     bool isFontRelativeLength() const
     {
         return type() == UnitType::Ems
             || type() == UnitType::Exs
             || type() == UnitType::Rems
             || type() == UnitType::Chs;
     }
     bool isViewportPercentageLength() const { return isViewportPercentageLength(type()); }
     static bool isViewportPercentageLength(UnitType type) { return type >= UnitType::ViewportWidth && type <= UnitType::ViewportMax; }
@@ skipping 83 matching lines @@
     // Converts to a Length (Fixed, Percent or Calculated)
     Length convertToLength(const CSSToLengthConversionData&);
 
     double getDoubleValue() const;
     float getFloatValue() const { return getValue<float>(); }
     int getIntValue() const { return getValue<int>(); }
     template<typename T> inline T getValue() const { return clampTo<T>(getDoubleValue()); }
 
     String getStringValue() const;
 
-    Counter* getCounterValue() const { ASSERT(isCounter()); return m_value.counter; }
     Rect* getRectValue() const { ASSERT(isRect()); return m_value.rect; }
     Quad* getQuadValue() const { ASSERT(isQuad()); return m_value.quad; }
     RGBA32 getRGBA32Value() const { ASSERT(isRGBColor()); return m_value.rgbcolor; }
 
     // TODO(timloh): Add isPair() and update callers so we can ASSERT(isPair())
     Pair* getPairValue() const { return type() != UnitType::Pair ? 0 : m_value.pair; }
 
     CSSBasicShape* getShapeValue() const { ASSERT(isShape()); return m_value.shape; }
     CSSCalcValue* cssCalcValue() const { ASSERT(isCalculated()); return m_value.calc; }
     CSSPropertyID getPropertyID() const { ASSERT(isPropertyID()); return m_value.propertyID; }
@@ skipping 40 matching lines @@
         init(val);
     }
 
     static void create(int); // compile-time guard
     static void create(unsigned); // compile-time guard
     template<typename T> operator T*(); // compile-time guard
 
     void init(UnitType);
     void init(const Length&);
     void init(const LengthSize&, const ComputedStyle&);
-    void init(PassRefPtrWillBeRawPtr<Counter>);
     void init(PassRefPtrWillBeRawPtr<Rect>);
     void init(PassRefPtrWillBeRawPtr<Pair>);
     void init(PassRefPtrWillBeRawPtr<Quad>);
     void init(PassRefPtrWillBeRawPtr<CSSBasicShape>);
     void init(PassRefPtrWillBeRawPtr<CSSCalcValue>);
 
     double computeLengthDouble(const CSSToLengthConversionData&);
 
     inline UnitType type() const { return static_cast<UnitType>(m_primitiveUnitType); }
 
     union {
         CSSPropertyID propertyID;
         CSSValueID valueID;
         double num;
         StringImpl* string;
         RGBA32 rgbcolor;
         // FIXME: oilpan: Should be members, but no support for members in unions. Just trace the raw ptr for now.
         CSSBasicShape* shape;
         CSSCalcValue* calc;
-        Counter* counter;
         Pair* pair;
         Rect* rect;
         Quad* quad;
     } m_value;
 };
 
 typedef CSSPrimitiveValue::CSSLengthArray CSSLengthArray;
 typedef CSSPrimitiveValue::CSSLengthTypeArray CSSLengthTypeArray;
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSPrimitiveValue, isPrimitiveValue());
 
 } // namespace blink
 
 #endif // CSSPrimitiveValue_h