Oilpan: Move all supplements of Page, Document, and WorkerClients to the managed heap.

Source/platform/RefCountedSupplement.h

 /*
  * Copyright (C) 2012 Google, Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #ifndef RefCountedSupplement_h
 #define RefCountedSupplement_h
 
 #include "platform/Supplementable.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
 
+#if !ENABLE(OILPAN)
 template<class T, class S>
 class RefCountedSupplement : public RefCounted<S> {
 public:
     typedef RefCountedSupplement<T, S> ThisType;
 
     virtual ~RefCountedSupplement() { }
 
     class Wrapper FINAL : public Supplement<T> {
     public:
         explicit Wrapper(PassRefPtr<ThisType> wrapped) : m_wrapped(wrapped) { }
@@ skipping 17 matching lines @@
 
     static ThisType* from(Supplementable<T>& host, const char* key)
     {
         Supplement<T>* found = static_cast<Supplement<T>*>(host.requireSupplement(key));
         if (!found)
             return 0;
         ASSERT_WITH_SECURITY_IMPLICATION(found->isRefCountedWrapper());
         return static_cast<Wrapper*>(found)->wrapped();
     }
 };
-
-// FIXME: Oilpan: Consider moving all supplements to the managed heap (as HeapSupplement) and removing this wrapper.
-template<typename T, typename S>
-class RefCountedGarbageCollectedSupplement : public RefCountedGarbageCollected<S> {
-public:
-    typedef RefCountedGarbageCollectedSupplement<T, S> ThisType;
-
-    virtual ~RefCountedGarbageCollectedSupplement() { }
-
-    class Wrapper FINAL : public Supplement<T> {
-    public:
-        explicit Wrapper(ThisType* wrapped) : m_wrapped(wrapped) { }
-        virtual ~Wrapper() { }
-        ThisType* wrapped() const { return m_wrapped; }
-        virtual void trace(Visitor* visitor) OVERRIDE { visitor->trace(m_wrapped); }
-    private:
-        Member<ThisType> m_wrapped;
-    };
-
-    static void provideTo(Supplementable<T>& host, const char* key, ThisType* supplement)
-    {
-        host.provideSupplement(key, adoptPtr(new Wrapper(supplement)));
-    }
-
-    static ThisType* from(Supplementable<T>& host, const char* key)
-    {
-        Supplement<T>* found = static_cast<Supplement<T>*>(host.requireSupplement(key));
-        if (!found)
-            return 0;
-        return static_cast<Wrapper*>(found)->wrapped();
-    }
-
-    virtual void trace(Visitor*) = 0;
-};
+#endif
 
 } // namespace WebCore
 
 #endif // RefCountedSupplement_h