Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSCalculationValue.h

Index: Source/core/css/CSSCalculationValue.h
diff --git a/Source/core/css/CSSCalculationValue.h b/Source/core/css/CSSCalculationValue.h
index 552babdebae9d43951e2ea929c0f6de7ea00c968..dca9a422b1ad49241fa410770b8714e44a4d492d 100644
--- a/Source/core/css/CSSCalculationValue.h
+++ b/Source/core/css/CSSCalculationValue.h
@@ -66,9 +66,12 @@ enum CalculationCategory {
     CalcOther
 };
 
-class CSSCalcExpressionNode : public RefCountedWillBeGarbageCollected<CSSCalcExpressionNode> {
-    DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(CSSCalcExpressionNode);
+class CSSCalcExpressionNode : public RefCounted<CSSCalcExpressionNode> {
 public:
+    virtual ~CSSCalcExpressionNode()
+    {
+    }
+
     enum Type {
         CssCalcPrimitiveValue = 1,
         CssCalcBinaryOperation
@@ -87,8 +90,6 @@ public:
     virtual CSSPrimitiveValue::UnitType typeWithCalcResolved() const = 0;
     bool isInteger() const { return m_isInteger; }
 
-    DEFINE_INLINE_VIRTUAL_TRACE() { }
-
 protected:
     CSSCalcExpressionNode(CalculationCategory category, bool isInteger)
         : m_category(category)
@@ -101,14 +102,14 @@ protected:
     bool m_isInteger;
 };
 
-class CORE_EXPORT CSSCalcValue : public RefCountedWillBeGarbageCollected<CSSCalcValue> {
+class CORE_EXPORT CSSCalcValue : public RefCounted<CSSCalcValue> {
 public:
-    static PassRefPtrWillBeRawPtr<CSSCalcValue> create(const CSSParserTokenRange&, ValueRange);
-    static PassRefPtrWillBeRawPtr<CSSCalcValue> create(PassRefPtrWillBeRawPtr<CSSCalcExpressionNode>, ValueRange = ValueRangeAll);
+    static PassRefPtr<CSSCalcValue> create(const CSSParserTokenRange&, ValueRange);
+    static PassRefPtr<CSSCalcValue> create(PassRefPtr<CSSCalcExpressionNode>, ValueRange = ValueRangeAll);
 
-    static PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> createExpressionNode(PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, bool isInteger = false);
-    static PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> createExpressionNode(PassRefPtrWillBeRawPtr<CSSCalcExpressionNode>, PassRefPtrWillBeRawPtr<CSSCalcExpressionNode>, CalcOperator);
-    static PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> createExpressionNode(double pixels, double percent);
+    static PassRefPtr<CSSCalcExpressionNode> createExpressionNode(PassRefPtr<CSSPrimitiveValue>, bool isInteger = false);
+    static PassRefPtr<CSSCalcExpressionNode> createExpressionNode(PassRefPtr<CSSCalcExpressionNode>, PassRefPtr<CSSCalcExpressionNode>, CalcOperator);
+    static PassRefPtr<CSSCalcExpressionNode> createExpressionNode(double pixels, double percent);
 
     PassRefPtr<CalculationValue> toCalcValue(const CSSToLengthConversionData& conversionData) const
     {
@@ -128,13 +129,8 @@ public:
     String customCSSText() const;
     bool equals(const CSSCalcValue&) const;
 
-    DEFINE_INLINE_TRACE()
-    {
-        visitor->trace(m_expression);
-    }
-
 private:
-    CSSCalcValue(PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> expression, ValueRange range)
+    CSSCalcValue(PassRefPtr<CSSCalcExpressionNode> expression, ValueRange range)
         : m_expression(expression)
         , m_nonNegative(range == ValueRangeNonNegative)
     {
@@ -142,7 +138,7 @@ private:
 
     double clampToPermittedRange(double) const;
 
-    const RefPtrWillBeMember<CSSCalcExpressionNode> m_expression;
+    const RefPtr<CSSCalcExpressionNode> m_expression;
     const bool m_nonNegative;
 };