Oilpan: move WorkerGlobalScope to oilpan's heap.

Source/modules/imagebitmap/ImageBitmapFactories.h

Index: Source/modules/imagebitmap/ImageBitmapFactories.h
diff --git a/Source/modules/imagebitmap/ImageBitmapFactories.h b/Source/modules/imagebitmap/ImageBitmapFactories.h
index c5e8103cd9da611b992b4bd508c5917195ce4c15..5a10b766279866b3dc93ce02bfccaa802be53b4f 100644
--- a/Source/modules/imagebitmap/ImageBitmapFactories.h
+++ b/Source/modules/imagebitmap/ImageBitmapFactories.h
@@ -36,7 +36,6 @@
 #include "bindings/v8/ScriptState.h"
 #include "core/fileapi/FileReaderLoader.h"
 #include "core/fileapi/FileReaderLoaderClient.h"
-#include "core/workers/WorkerSupplementable.h"
 #include "platform/Supplementable.h"
 #include "platform/geometry/IntRect.h"
 #include "wtf/Forward.h"
@@ -55,7 +54,7 @@ class ImageBitmap;
 class ImageData;
 class ExecutionContext;
 
-class ImageBitmapFactories FINAL : public Supplement<DOMWindow>, public WorkerSupplement {
+class ImageBitmapFactories : public Supplement<DOMWindow> {
 
 class ImageBitmapLoader;
 
@@ -79,6 +78,9 @@ public:
 
     virtual ~ImageBitmapFactories() { }
 
+protected:
+    static const char* supplementName();
+
 private:
     class ImageBitmapLoader FINAL : public RefCounted<ImageBitmapLoader>, public FileReaderLoaderClient {
     public:
@@ -109,17 +111,28 @@ private:
         IntRect m_cropRect;
     };
 
-    static const char* supplementName();
     static ImageBitmapFactories& from(EventTarget&);
 
-    template <class T>
-    static ImageBitmapFactories& fromInternal(T&);
+    static ImageBitmapFactories& fromInternal(DOMWindow&);
 
     void addLoader(PassRefPtr<ImageBitmapLoader>);
 
     HashSet<RefPtr<ImageBitmapLoader> > m_pendingLoaders;
 };
 
+// FIXME: oilpan: remove once DOMWindow and its Supplementable becomes heap allocated.
+class WorkerGlobalScopeImageBitmapFactories FINAL : public NoBaseWillBeGarbageCollectedFinalized<WorkerGlobalScopeImageBitmapFactories>, public ImageBitmapFactories, public WillBeHeapSupplement<WorkerGlobalScope> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScopeImageBitmapFactories);
+public:
+    virtual ~WorkerGlobalScopeImageBitmapFactories() { }
+
+    virtual void trace(Visitor*);

[haraken, 2014/03/03 12:55:50]

Add OVERRIDE.

[sof, 2014/03/04 08:18:00]

That wouldn't be quite right, this is a/the base GC class. Kept as is.

+
+private:
+    friend class ImageBitmapFactories;
+    static ImageBitmapFactories& fromInternal(WorkerGlobalScope&);
+};
+
 } // namespace WebCore
 
 #endif // ImageBitmapFactories_h