Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSPrimitiveValue.cpp

Index: Source/core/css/CSSPrimitiveValue.cpp
diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp
index 477da87b9ae30526333df3d53120fc81f742c2fa..7d963bdbd8a4b1115a0efc08386e345d09085e60 100644
--- a/Source/core/css/CSSPrimitiveValue.cpp
+++ b/Source/core/css/CSSPrimitiveValue.cpp
@@ -341,35 +341,35 @@ void CSSPrimitiveValue::init(const LengthSize& lengthSize, const ComputedStyle&
     m_value.pair = Pair::create(create(lengthSize.width(), style.effectiveZoom()), create(lengthSize.height(), style.effectiveZoom()), Pair::KeepIdenticalValues).leakRef();
 }
 
-void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Rect> r)
+void CSSPrimitiveValue::init(PassRefPtr<Rect> r)
 {
     init(UnitType::Rect);
     m_hasCachedCSSText = false;
     m_value.rect = r.leakRef();
 }
 
-void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Quad> quad)
+void CSSPrimitiveValue::init(PassRefPtr<Quad> quad)
 {
     init(UnitType::Quad);
     m_hasCachedCSSText = false;
     m_value.quad = quad.leakRef();
 }
 
-void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Pair> p)
+void CSSPrimitiveValue::init(PassRefPtr<Pair> p)
 {
     init(UnitType::Pair);
     m_hasCachedCSSText = false;
     m_value.pair = p.leakRef();
 }
 
-void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<CSSCalcValue> c)
+void CSSPrimitiveValue::init(PassRefPtr<CSSCalcValue> c)
 {
     init(UnitType::Calc);
     m_hasCachedCSSText = false;
     m_value.calc = c.leakRef();
 }
 
-void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<CSSBasicShape> shape)
+void CSSPrimitiveValue::init(PassRefPtr<CSSBasicShape> shape)
 {
     init(UnitType::Shape);
     m_hasCachedCSSText = false;
@@ -392,38 +392,23 @@ void CSSPrimitiveValue::cleanup()
             m_value.string->deref();
         break;
     case UnitType::Rect:
-        // We must not call deref() when oilpan is enabled because m_value.rect is traced.
-#if !ENABLE(OILPAN)
         m_value.rect->deref();
-#endif
         break;
     case UnitType::Quad:
-        // We must not call deref() when oilpan is enabled because m_value.quad is traced.
-#if !ENABLE(OILPAN)
         m_value.quad->deref();
-#endif
         break;
     case UnitType::Pair:
-        // We must not call deref() when oilpan is enabled because m_value.pair is traced.
-#if !ENABLE(OILPAN)
         m_value.pair->deref();
-#endif
         break;
     case UnitType::Calc:
-        // We must not call deref() when oilpan is enabled because m_value.calc is traced.
-#if !ENABLE(OILPAN)
         m_value.calc->deref();
-#endif
         break;
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
         ASSERT_NOT_REACHED();
         break;
     case UnitType::Shape:
-        // We must not call deref() when oilpan is enabled because m_value.shape is traced.
-#if !ENABLE(OILPAN)
         m_value.shape->deref();
-#endif
         break;
     case UnitType::Number:
     case UnitType::Integer:
@@ -1089,30 +1074,4 @@ bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
     return false;
 }
 
-DEFINE_TRACE_AFTER_DISPATCH(CSSPrimitiveValue)
-{
-#if ENABLE(OILPAN)
-    switch (type()) {
-    case UnitType::Rect:
-        visitor->trace(m_value.rect);
-        break;
-    case UnitType::Quad:
-        visitor->trace(m_value.quad);
-        break;
-    case UnitType::Pair:
-        visitor->trace(m_value.pair);
-        break;
-    case UnitType::Calc:
-        visitor->trace(m_value.calc);
-        break;
-    case UnitType::Shape:
-        visitor->trace(m_value.shape);
-        break;
-    default:
-        break;
-    }
-#endif
-    CSSValue::traceAfterDispatch(visitor);
-}
-
 } // namespace blink