Remove various Heap* types.

sky/engine/platform/Supplementable.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 80 matching lines @@
 template<typename T, bool isGarbageCollected>
 class SupplementBase;
 
 template<typename T, bool isGarbageCollected>
 class SupplementableBase;
 
 template<typename T, bool isGarbageCollected>
 struct SupplementableTraits;
 
 template<typename T>
-struct SupplementableTraits<T, true> {
-    typedef RawPtr<SupplementBase<T, true> > SupplementArgumentType;
-    typedef HeapHashMap<const char*, Member<SupplementBase<T, true> >, PtrHash<const char*> > SupplementMap;
-};
-
-template<typename T>
 struct SupplementableTraits<T, false> {
     typedef PassOwnPtr<SupplementBase<T, false> > SupplementArgumentType;
     typedef HashMap<const char*, OwnPtr<SupplementBase<T, false> >, PtrHash<const char*> > SupplementMap;
 };
 
 template<bool>
 class SupplementTracing;
 
 template<>
-class SupplementTracing<true> : public GarbageCollectedMixin { };
-
-template<>
 class SupplementTracing<false> {
 public:
     virtual ~SupplementTracing() { }
-    virtual void trace(Visitor*) { }
 };
 
 template<typename T, bool isGarbageCollected = false>
 class SupplementBase : public SupplementTracing<isGarbageCollected> {
 public:
 #if ENABLE(SECURITY_ASSERT)
     virtual bool isRefCountedWrapper() const { return false; }
 #endif
 
     static void provideTo(SupplementableBase<T, isGarbageCollected>& host, const char* key, typename SupplementableTraits<T, isGarbageCollected>::SupplementArgumentType supplement)
@@ skipping 56 matching lines @@
 
 #if ENABLE(ASSERT)
 protected:
     SupplementableBase() : m_threadId(currentThread()) { }
 
 private:
     ThreadIdentifier m_threadId;
 #endif
 };
 
-// This class is used to make an on-heap class supplementable. Its supplements
-// must be HeapSupplement.
-template<typename T>
-class HeapSupplement : public SupplementBase<T, true> { };
-
-// FIXME: Oilpan: Move GarbageCollectedMixin to SupplementableBase<T, true> once PersistentHeapSupplementable is removed again.
-template<typename T>
-class GC_PLUGIN_IGNORE("http://crbug.com/395036") HeapSupplementable : public SupplementableBase<T, true>, public GarbageCollectedMixin {
-public:
-    virtual void trace(Visitor* visitor) override
-    {
-        visitor->trace(this->m_supplements);
-        SupplementableBase<T, true>::trace(visitor);
-    }
-};
 
 template<typename T>
 class Supplement : public SupplementBase<T, false> { };
 
 // This class is used to make an off-heap class supplementable with off-heap
 // supplements (Supplement).
 template<typename T>
 class GC_PLUGIN_IGNORE("http://crbug.com/395036") Supplementable : public SupplementableBase<T, false> {
-public:
-    virtual void trace(Visitor* visitor)
-    {
-    }
-};
-
-template<typename T>
-struct ThreadingTrait<SupplementBase<T, true> > {
-    static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity;
-};
-
-template<typename T>
-struct ThreadingTrait<SupplementableBase<T, true> > {
-    static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity;
 };
 
 } // namespace blink
 
 #endif // Supplementable_h