Oilpan: move WorkerGlobalScope to oilpan's heap.

Source/modules/imagebitmap/ImageBitmapFactories.h

 /*
  * Copyright (c) 2013, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 37 matching lines @@
 class CanvasRenderingContext2D;
 class EventTarget;
 class ExceptionState;
 class HTMLCanvasElement;
 class HTMLImageElement;
 class HTMLVideoElement;
 class ImageBitmap;
 class ImageData;
 class ExecutionContext;
 
-class ImageBitmapFactories FINAL : public Supplement<DOMWindow>, public WorkerSupplement {
+class ImageBitmapFactories : public Supplement<DOMWindow> {
 
 class ImageBitmapLoader;
 
 public:
     static ScriptPromise createImageBitmap(EventTarget&, HTMLImageElement*, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, HTMLImageElement*, int sx, int sy, int sw, int sh, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, HTMLVideoElement*, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, HTMLVideoElement*, int sx, int sy, int sw, int sh, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, CanvasRenderingContext2D*, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, CanvasRenderingContext2D*, int sx, int sy, int sw, int sh, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, HTMLCanvasElement*, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, HTMLCanvasElement*, int sx, int sy, int sw, int sh, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, Blob*, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, Blob*, int sx, int sy, int sw, int sh, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, ImageData*, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, ImageData*, int sx, int sy, int sw, int sh, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, ImageBitmap*, ExceptionState&);
     static ScriptPromise createImageBitmap(EventTarget&, ImageBitmap*, int sx, int sy, int sw, int sh, ExceptionState&);
 
     void didFinishLoading(ImageBitmapLoader*);
 
     virtual ~ImageBitmapFactories() { }
 
+protected:
+    static const char* supplementName();
+
 private:
     class ImageBitmapLoader FINAL : public RefCounted<ImageBitmapLoader>, public FileReaderLoaderClient {
     public:
         static PassRefPtr<ImageBitmapLoader> create(ImageBitmapFactories& factory, PassRefPtr<ScriptPromiseResolver> resolver, const IntRect& cropRect)
         {
             return adoptRef(new ImageBitmapLoader(factory, resolver, cropRect));
         }
 
         void loadBlobAsync(ExecutionContext*, Blob*);
 
@@ skipping 10 matching lines @@
         virtual void didFinishLoading() OVERRIDE;
         virtual void didFail(FileError::ErrorCode) OVERRIDE;
 
         ScriptState* m_scriptState;
         FileReaderLoader m_loader;
         ImageBitmapFactories* m_factory;
         RefPtr<ScriptPromiseResolver> m_resolver;
         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