CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/Counter.h

Index: Source/core/css/Counter.h
diff --git a/Source/core/css/Counter.h b/Source/core/css/Counter.h
index 177fc14c539b7325ed5fc08943a28be528c08569..cb253377a62c516c6f48b798dd16eb690fbea963 100644
--- a/Source/core/css/Counter.h
+++ b/Source/core/css/Counter.h
@@ -21,27 +21,27 @@
 #ifndef Counter_h
 #define Counter_h
 
-#include "core/css/CSSPrimitiveValue.h"
+#include "core/css/CSSValue.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-class Counter : public RefCountedWillBeGarbageCollected<Counter> {
+class Counter : public RefCountedWillBeGarbageCollectedFinalized<Counter> {
 public:
-    static PassRefPtrWillBeRawPtr<Counter> create(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator)
+    static PassRefPtrWillBeRawPtr<Counter> create(CSSPrimitiveValue identifier, CSSPrimitiveValue listStyle, CSSPrimitiveValue separator)
     {
         return adoptRefWillBeNoop(new Counter(identifier, listStyle, separator));
     }
 
-    String identifier() const { return m_identifier ? m_identifier->getStringValue() : String(); }
-    String listStyle() const { return m_listStyle ? m_listStyle->getStringValue() : String(); }
-    String separator() const { return m_separator ? m_separator->getStringValue() : String(); }
+    String identifier() const { return toCSSPrimitiveValue(m_identifier).getStringValue(); }
+    String listStyle() const { return toCSSPrimitiveValue(m_listStyle).getStringValue(); }
+    String separator() const { return toCSSPrimitiveValue(m_separator).getStringValue(); }
 
-    CSSValueID listStyleIdent() const { return m_listStyle ? m_listStyle->getValueID() : CSSValueInvalid; }
+    CSSValueID listStyleIdent() const { return toCSSPrimitiveValue(m_listStyle).getValueID(); }
 
-    void setIdentifier(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier) { m_identifier = identifier; }
-    void setListStyle(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle) { m_listStyle = listStyle; }
-    void setSeparator(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator) { m_separator = separator; }
+    void setIdentifier(CSSPrimitiveValue identifier) { m_identifier = identifier; }
+    void setListStyle(CSSPrimitiveValue listStyle) { m_listStyle = listStyle; }
+    void setSeparator(CSSPrimitiveValue separator) { m_separator = separator; }
 
     bool equals(const Counter& other) const
     {
@@ -53,14 +53,14 @@ public:
     DECLARE_TRACE();
 
 private:
-    Counter(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator)
+    Counter(CSSPrimitiveValue identifier, CSSPrimitiveValue listStyle, CSSPrimitiveValue separator)
         : m_identifier(identifier)
         , m_listStyle(listStyle)
         , m_separator(separator) { }
 
-    RefPtrWillBeMember<CSSPrimitiveValue> m_identifier; // string
-    RefPtrWillBeMember<CSSPrimitiveValue> m_listStyle; // ident
-    RefPtrWillBeMember<CSSPrimitiveValue> m_separator; // string
+    CSSValue m_identifier; // string
+    CSSValue m_listStyle; // ident
+    CSSValue m_separator; // string
 };
 
 } // namespace blink