Split out String, URI and CustomIdent from CSSPrimitiveValue

Source/core/css/CSSValue.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 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,
@@ skipping 54 matching lines @@
     bool isBaseValueList() const { return m_classType == ValueListClass; }
 
     bool isBorderImageSliceValue() const { return m_classType == BorderImageSliceClass; }
     bool isCanvasValue() const { return m_classType == CanvasClass; }
     bool isCounterValue() const { return m_classType == CounterClass; }
     bool isCursorImageValue() const { return m_classType == CursorImageClass; }
     bool isCrossfadeValue() const { return m_classType == CrossfadeClass; }
     bool isFontFeatureValue() const { return m_classType == FontFeatureClass; }
     bool isFontFaceSrcValue() const { return m_classType == FontFaceSrcClass; }
     bool isFunctionValue() const { return m_classType == FunctionClass; }
+    bool isCustomIdentValue() const { return m_classType == CustomIdentClass; }
     bool isImageGeneratorValue() const { return m_classType >= CanvasClass && m_classType <= RadialGradientClass; }
     bool isGradientValue() const { return m_classType >= LinearGradientClass && m_classType <= RadialGradientClass; }
     bool isImageSetValue() const { return m_classType == ImageSetClass; }
     bool isImageValue() const { return m_classType == ImageClass; }
     bool isImplicitInitialValue() const;
     bool isInheritedValue() const { return m_classType == InheritedClass; }
     bool isInitialValue() const { return m_classType == InitialClass; }
     bool isUnsetValue() const { return m_classType == UnsetClass; }
     bool isCSSWideKeyword() const { return m_classType >= InheritedClass && m_classType <= UnsetClass; }
     bool isLinearGradientValue() const { return m_classType == LinearGradientClass; }
     bool isPathValue() const { return m_classType == PathClass; }
     bool isQuadValue() const { return m_classType == QuadClass; }
     bool isRadialGradientValue() const { return m_classType == RadialGradientClass; }
     bool isReflectValue() const { return m_classType == ReflectClass; }
     bool isShadowValue() const { return m_classType == ShadowClass; }
+    bool isStringValue() const { return m_classType == StringClass; }
+    bool isURIValue() const { return m_classType == URIClass; }
     bool isCubicBezierTimingFunctionValue() const { return m_classType == CubicBezierTimingFunctionClass; }
     bool isStepsTimingFunctionValue() const { return m_classType == StepsTimingFunctionClass; }
     bool isGridTemplateAreasValue() const { return m_classType == GridTemplateAreasClass; }
     bool isSVGDocumentValue() const { return m_classType == CSSSVGDocumentClass; }
     bool isContentDistributionValue() const { return m_classType == CSSContentDistributionClass; }
     bool isUnicodeRangeValue() const { return m_classType == UnicodeRangeClass; }
     bool isGridLineNamesValue() const { return m_classType == GridLineNamesClass; }
 
     bool hasFailedOrCanceledSubresources() const;
 
     bool equals(const CSSValue&) const;
 
     void finalizeGarbageCollectedObject();
     DEFINE_INLINE_TRACE_AFTER_DISPATCH() { }
     DECLARE_TRACE();
 
     // ~CSSValue should be public, because non-public ~CSSValue causes C2248
     // error: 'blink::CSSValue::~CSSValue' : cannot access protected member
     // declared in class 'blink::CSSValue' when compiling
     // 'source\wtf\refcounted.h' by using msvc.
     ~CSSValue() { }
 
-protected:
-
     static const size_t ClassTypeBits = 6;
     enum ClassType {
         PrimitiveClass,
         CounterClass,
         QuadClass,
+        CustomIdentClass,
+        StringClass,
+        URIClass,
         ValuePairClass,
 
         // Image classes.
         ImageClass,
         CursorImageClass,
 
         // Image generator classes.
         CanvasClass,
         CrossfadeClass,
         LinearGradientClass,
@@ skipping 24 matching lines @@
         CSSContentDistributionClass,
 
         // List class types must appear after ValueListClass.
         ValueListClass,
         FunctionClass,
         ImageSetClass,
         GridLineNamesClass,
         // Do not append non-list class types here.
     };
 
+protected:
     static const size_t ValueListSeparatorBits = 2;
     enum ValueListSeparator {
         SpaceSeparator,
         CommaSeparator,
         SlashSeparator
     };
 
     ClassType classType() const { return static_cast<ClassType>(m_classType); }
 
     explicit CSSValue(ClassType classType)
@@ skipping 70 matching lines @@
         return false;
     return first->equals(*second);
 }
 
 #define DEFINE_CSS_VALUE_TYPE_CASTS(thisType, predicate) \
     DEFINE_TYPE_CASTS(thisType, CSSValue, value, value->predicate, value.predicate)
 
 } // namespace blink
 
 #endif // CSSValue_h