Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/css/CSSBasicShapeValues.h

 /*
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 31 matching lines @@
 
 class CSSBasicShapeCircleValue final : public CSSValue {
 public:
     static CSSBasicShapeCircleValue* create() { return new CSSBasicShapeCircleValue; }
 
     String customCSSText() const;
     bool equals(const CSSBasicShapeCircleValue&) const;
 
     CSSValue* centerX() const { return m_centerX.get(); }
     CSSValue* centerY() const { return m_centerY.get(); }
-    CSSPrimitiveValue* radius() const { return m_radius.get(); }
+    CSSValue* radius() const { return m_radius.get(); }
 
     // TODO(sashab): Remove these and pass them as arguments in the constructor.
     void setCenterX(CSSValue* centerX) { m_centerX = centerX; }
     void setCenterY(CSSValue* centerY) { m_centerY = centerY; }
-    void setRadius(CSSPrimitiveValue* radius) { m_radius = radius; }
+    void setRadius(CSSValue* radius) { m_radius = radius; }
 
     DECLARE_TRACE_AFTER_DISPATCH();
 
 private:
     CSSBasicShapeCircleValue()
         : CSSValue(BasicShapeCircleClass)
         { }
 
     Member<CSSValue> m_centerX;
     Member<CSSValue> m_centerY;
-    Member<CSSPrimitiveValue> m_radius;
+    Member<CSSValue> m_radius;
 };
 
 class CSSBasicShapeEllipseValue final : public CSSValue {
 public:
     static CSSBasicShapeEllipseValue* create() { return new CSSBasicShapeEllipseValue; }
 
     String customCSSText() const;
     bool equals(const CSSBasicShapeEllipseValue&) const;
 
     CSSValue* centerX() const { return m_centerX.get(); }
     CSSValue* centerY() const { return m_centerY.get(); }
-    CSSPrimitiveValue* radiusX() const { return m_radiusX.get(); }
-    CSSPrimitiveValue* radiusY() const { return m_radiusY.get(); }
+    CSSValue* radiusX() const { return m_radiusX.get(); }
+    CSSValue* radiusY() const { return m_radiusY.get(); }
 
     // TODO(sashab): Remove these and pass them as arguments in the constructor.
     void setCenterX(CSSValue* centerX) { m_centerX = centerX; }
     void setCenterY(CSSValue* centerY) { m_centerY = centerY; }
-    void setRadiusX(CSSPrimitiveValue* radiusX) { m_radiusX = radiusX; }
-    void setRadiusY(CSSPrimitiveValue* radiusY) { m_radiusY = radiusY; }
+    void setRadiusX(CSSValue* radiusX) { m_radiusX = radiusX; }
+    void setRadiusY(CSSValue* radiusY) { m_radiusY = radiusY; }
 
     DECLARE_TRACE_AFTER_DISPATCH();
 
 private:
     CSSBasicShapeEllipseValue()
         : CSSValue(BasicShapeEllipseClass)
         { }
 
     Member<CSSValue> m_centerX;
     Member<CSSValue> m_centerY;
-    Member<CSSPrimitiveValue> m_radiusX;
-    Member<CSSPrimitiveValue> m_radiusY;
+    Member<CSSValue> m_radiusX;
+    Member<CSSValue> m_radiusY;
 };
 
 class CSSBasicShapePolygonValue final : public CSSValue {
 public:
     static CSSBasicShapePolygonValue* create() { return new CSSBasicShapePolygonValue; }
 
     void appendPoint(CSSPrimitiveValue* x, CSSPrimitiveValue* y)
     {
         m_values.append(x);
         m_values.append(y);
@@ skipping 92 matching lines @@
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSBasicShapeCircleValue, isBasicShapeCircleValue());
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSBasicShapeEllipseValue, isBasicShapeEllipseValue());
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSBasicShapePolygonValue, isBasicShapePolygonValue());
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSBasicShapeInsetValue, isBasicShapeInsetValue());
 
 } // namespace blink
 
 #endif // CSSBasicShapeValues_h