Split out String, URI and CustomIdent from CSSPrimitiveValue

Source/core/css/CSSCounterValue.h

Index: Source/core/css/CSSCounterValue.h
diff --git a/Source/core/css/CSSCounterValue.h b/Source/core/css/CSSCounterValue.h
index 838640ef4fa2c90541d471adaf0f0810a3636f88..b60989b9326f78aff4816dabfd75c84b56e0b7a6 100644
--- a/Source/core/css/CSSCounterValue.h
+++ b/Source/core/css/CSSCounterValue.h
@@ -22,6 +22,7 @@
 #define CSSCounterValue_h
 
 #include "core/css/CSSPrimitiveValue.h"
+#include "core/css/CSSStringValueBase.h"
 #include "core/css/CSSValue.h"
 #include "wtf/text/WTFString.h"
 
@@ -29,14 +30,14 @@ namespace blink {
 
 class CSSCounterValue : public CSSValue {
 public:
-    static PassRefPtrWillBeRawPtr<CSSCounterValue> create(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator)
+    static PassRefPtrWillBeRawPtr<CSSCounterValue> create(PassRefPtrWillBeRawPtr<CSSCustomIdentValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSCustomIdentValue> separator)
     {
         return adoptRefWillBeNoop(new CSSCounterValue(identifier, listStyle, separator));
     }
 
-    String identifier() const { return m_identifier->getStringValue(); }
+    String identifier() const { return m_identifier->value(); }
     CSSValueID listStyle() const { return m_listStyle->getValueID(); }
-    String separator() const { return m_separator->getStringValue(); }
+    String separator() const { return m_separator->value(); }
 
     bool equals(const CSSCounterValue& other) const
     {
@@ -50,20 +51,18 @@ public:
     DECLARE_TRACE_AFTER_DISPATCH();
 
 private:
-    CSSCounterValue(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> separator)
+    CSSCounterValue(PassRefPtrWillBeRawPtr<CSSCustomIdentValue> identifier, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle, PassRefPtrWillBeRawPtr<CSSCustomIdentValue> separator)
         : CSSValue(CounterClass)
         , m_identifier(identifier)
         , m_listStyle(listStyle)
         , m_separator(separator)
     {
-        ASSERT(m_identifier->isCustomIdent());
         ASSERT(m_listStyle->isValueID());
-        ASSERT(m_separator->isCustomIdent());
     }
 
-    RefPtrWillBeMember<CSSPrimitiveValue> m_identifier; // string
+    RefPtrWillBeMember<CSSCustomIdentValue> m_identifier;
     RefPtrWillBeMember<CSSPrimitiveValue> m_listStyle; // ident
-    RefPtrWillBeMember<CSSPrimitiveValue> m_separator; // string
+    RefPtrWillBeMember<CSSCustomIdentValue> m_separator;
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCounterValue, isCounterValue());