CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/Counter.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008 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 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
     {
         return identifier() == other.identifier()
             && listStyle() == other.listStyle()
             && separator() == other.separator();
     }
 
     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
 
 #endif // Counter_h