Oilpan: turn DOMWindow into a heap supplementable.

Source/modules/imagebitmap/ImageBitmapFactories.cpp

 /*
  * 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 258 matching lines @@
 {
     return "ImageBitmapFactories";
 }
 
 ImageBitmapFactories& ImageBitmapFactories::from(EventTarget& eventTarget)
 {
     if (DOMWindow* window = eventTarget.toDOMWindow())
         return fromInternal(*window);
 
     ASSERT(eventTarget.executionContext()->isWorkerGlobalScope());
-    return WorkerGlobalScopeImageBitmapFactories::fromInternal(*toWorkerGlobalScope(eventTarget.executionContext()));
+    return ImageBitmapFactories::fromInternal(*toWorkerGlobalScope(eventTarget.executionContext()));
 }
 
-ImageBitmapFactories& ImageBitmapFactories::fromInternal(DOMWindow& object)
+template<class GlobalObject>
+ImageBitmapFactories& ImageBitmapFactories::fromInternal(GlobalObject& object)
 {
-    ImageBitmapFactories* supplement = static_cast<ImageBitmapFactories*>(Supplement<DOMWindow>::from(object, supplementName()));
+    ImageBitmapFactories* supplement = static_cast<ImageBitmapFactories*>(WillBeHeapSupplement<GlobalObject>::from(object, supplementName()));
     if (!supplement) {
         supplement = new ImageBitmapFactories();
-        Supplement<DOMWindow>::provideTo(object, supplementName(), adoptPtr(supplement));
+        WillBeHeapSupplement<GlobalObject>::provideTo(object, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
 
 void ImageBitmapFactories::addLoader(PassRefPtr<ImageBitmapLoader> loader)
 {
     m_pendingLoaders.add(loader);
 }
 
 void ImageBitmapFactories::didFinishLoading(ImageBitmapLoader* loader)
@@ skipping 54 matching lines @@
     ScriptScope scope(m_scriptState);
     m_resolver->resolve(imageBitmap.release());
     m_factory->didFinishLoading(this);
 }
 
 void ImageBitmapFactories::ImageBitmapLoader::didFail(FileError::ErrorCode)
 {
     rejectPromise();
 }
 
-ImageBitmapFactories& WorkerGlobalScopeImageBitmapFactories::fromInternal(WorkerGlobalScope& object)
-{
-    WorkerGlobalScopeImageBitmapFactories* supplement = static_cast<WorkerGlobalScopeImageBitmapFactories*>(WillBeHeapSupplement<WorkerGlobalScope>::from(object, ImageBitmapFactories::supplementName()));
-    if (!supplement) {
-        supplement = new WorkerGlobalScopeImageBitmapFactories();
-        WillBeHeapSupplement<WorkerGlobalScope>::provideTo(object, ImageBitmapFactories::supplementName(), adoptPtrWillBeNoop(supplement));
-    }
-    return *supplement;
-}
-
-void WorkerGlobalScopeImageBitmapFactories::trace(Visitor*)
-{
-}
-
 } // namespace WebCore