Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 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 323 matching lines @@
     m_primitiveUnitType = static_cast<unsigned>(type);
 }
 
 void CSSPrimitiveValue::init(const LengthSize& lengthSize, const ComputedStyle& style)
 {
     init(UnitType::Pair);
     m_hasCachedCSSText = false;
     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;
     m_value.shape = shape.leakRef();
 }
 
 CSSPrimitiveValue::~CSSPrimitiveValue()
 {
     cleanup();
 }
 
 void CSSPrimitiveValue::cleanup()
 {
     switch (type()) {
     case UnitType::CustomIdentifier:
     case UnitType::String:
     case UnitType::URI:
     case UnitType::Attribute:
         if (m_value.string)
             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:
     case UnitType::Percentage:
     case UnitType::Ems:
     case UnitType::QuirkyEms:
     case UnitType::Exs:
     case UnitType::Rems:
     case UnitType::Chs:
     case UnitType::Pixels:
@@ skipping 645 matching lines @@
     case UnitType::Integer:
     case UnitType::Chs:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
         return false;
     }
     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