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..cba1648aa6623a7a83d8aadd638e5e28ada84aea 100644
--- a/Source/modules/imagebitmap/ImageBitmapFactories.h
+++ b/Source/modules/imagebitmap/ImageBitmapFactories.h
@@ -55,7 +55,7 @@ class ImageBitmap;
 class ImageData;
 class ExecutionContext;
 
-class ImageBitmapFactories FINAL : public Supplement<DOMWindow>, public WorkerSupplement {
+class ImageBitmapFactories : public Supplement<DOMWindow> {
 
 class ImageBitmapLoader;
 
@@ -79,6 +79,9 @@ public:
 
     virtual ~ImageBitmapFactories() { }
 
+protected:
+    static const char* supplementName();
+
 private:
     class ImageBitmapLoader FINAL : public RefCounted<ImageBitmapLoader>, public FileReaderLoaderClient {
     public:
@@ -109,17 +112,26 @@ 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;
 };
 
+class WorkerGlobalScopeImageBitmapFactories FINAL : public ImageBitmapFactories, public NoBaseWillBeGarbageCollectedFinalized<WorkerGlobalScopeImageBitmapFactories>, public WorkerSupplement {

[Mads Ager (chromium), 2014/02/26 13:09:08]

Please make the garbage collected base class the left-most base class.

This is a little subtle. So this thing is only ever used as a supplement and it
is traced through the supplement map. Whenever an ImageBitmapFactories object is
returned it is returned as a reference to the instance in the supplement map.

Could you add a FIXME: oilpan: here to state that we should collapse the
ImageBitmapFactories into one class once DOMWindow has been moved to the oilpan
heap?

[sof, 2014/02/26 14:36:25]

Done. I think we just have to accept the quirky formulation of this dual
supplement class until both supplements are heap allocated.

+public:
+    virtual ~WorkerGlobalScopeImageBitmapFactories() { }
+
+    virtual void trace(Visitor*);
+
+private:
+    friend class ImageBitmapFactories;
+    static ImageBitmapFactories& fromInternal(WorkerGlobalScope&);
+};
+
 } // namespace WebCore
 
 #endif // ImageBitmapFactories_h