Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSValue.h

Index: Source/core/css/CSSValue.h
diff --git a/Source/core/css/CSSValue.h b/Source/core/css/CSSValue.h
index f5f7bac0274d156da50b3e5806bf0f8a82b157b5..6010f87ac317db059da6336989183667efaa615c 100644
--- a/Source/core/css/CSSValue.h
+++ b/Source/core/css/CSSValue.h
@@ -31,22 +31,8 @@
 
 namespace blink {
 
-class CORE_EXPORT CSSValue : public RefCountedWillBeGarbageCollectedFinalized<CSSValue> {
+class CORE_EXPORT CSSValue : public RefCounted<CSSValue> {
 public:
-#if ENABLE(OILPAN)
-    // Override operator new to allocate CSSValue subtype objects onto
-    // a dedicated heap.
-    GC_PLUGIN_IGNORE("crbug.com/443854")
-    void* operator new(size_t size)
-    {
-        return allocateObject(size, false);
-    }
-    static void* allocateObject(size_t size, bool isEager)
-    {
-        ThreadState* state = ThreadStateFor<ThreadingTrait<CSSValue>::Affinity>::state();
-        return Heap::allocateOnHeapIndex(state, size, isEager ? ThreadState::EagerSweepHeapIndex : ThreadState::CSSValueHeapIndex, GCInfoTrait<CSSValue>::index());
-    }
-#else
     // Override RefCounted's deref() to ensure operator delete is called on
     // the appropriate subclass type.
     void deref()
@@ -54,7 +40,6 @@ public:
         if (derefBase())
             destroy();
     }
-#endif // !ENABLE(OILPAN)
 
     String cssText() const;
 
@@ -99,8 +84,6 @@ public:
     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
@@ -198,15 +181,15 @@ private:
 };
 
 template<typename CSSValueType, size_t inlineCapacity>
-inline bool compareCSSValueVector(const WillBeHeapVector<RefPtrWillBeMember<CSSValueType>, inlineCapacity>& firstVector, const WillBeHeapVector<RefPtrWillBeMember<CSSValueType>, inlineCapacity>& secondVector)
+inline bool compareCSSValueVector(const Vector<RefPtr<CSSValueType>, inlineCapacity>& firstVector, const Vector<RefPtr<CSSValueType>, inlineCapacity>& secondVector)
 {
     size_t size = firstVector.size();
     if (size != secondVector.size())
         return false;
 
     for (size_t i = 0; i < size; i++) {
-        const RefPtrWillBeMember<CSSValueType>& firstPtr = firstVector[i];
-        const RefPtrWillBeMember<CSSValueType>& secondPtr = secondVector[i];
+        const RefPtr<CSSValueType>& firstPtr = firstVector[i];
+        const RefPtr<CSSValueType>& secondPtr = secondVector[i];
         if (firstPtr == secondPtr || (firstPtr && secondPtr && firstPtr->equals(*secondPtr)))
             continue;
         return false;