Index: Source/modules/imagebitmap/ImageBitmapFactories.h |
diff --git a/Source/modules/imagebitmap/ImageBitmapFactories.h b/Source/modules/imagebitmap/ImageBitmapFactories.h |
index b87b05803090c2051302910c10526bf43fc85f36..7ae4e7d148626edd201462bf9195f650fc69771a 100644 |
--- a/Source/modules/imagebitmap/ImageBitmapFactories.h |
+++ b/Source/modules/imagebitmap/ImageBitmapFactories.h |
@@ -81,11 +81,11 @@ protected: |
static const char* supplementName(); |
private: |
- class ImageBitmapLoader FINAL : public RefCountedWillBeGarbageCollectedFinalized<ImageBitmapLoader>, public FileReaderLoaderClient { |
+ class ImageBitmapLoader FINAL : public GarbageCollectedFinalized<ImageBitmapLoader>, public FileReaderLoaderClient { |
public: |
- static PassRefPtrWillBeRawPtr<ImageBitmapLoader> create(ImageBitmapFactories& factory, const IntRect& cropRect, ScriptState* scriptState) |
+ static ImageBitmapLoader* create(ImageBitmapFactories& factory, const IntRect& cropRect, ScriptState* scriptState) |
{ |
- return adoptRefWillBeNoop(new ImageBitmapLoader(factory, cropRect, scriptState)); |
+ return new ImageBitmapLoader(factory, cropRect, scriptState); |
} |
void loadBlobAsync(ExecutionContext*, Blob*); |
@@ -117,10 +117,10 @@ private: |
template<class GlobalObject> |
static ImageBitmapFactories& fromInternal(GlobalObject&); |
- void addLoader(PassRefPtrWillBeRawPtr<ImageBitmapLoader>); |
+ void addLoader(ImageBitmapLoader*); |
void didFinishLoading(ImageBitmapLoader*); |
- WillBeHeapHashSet<RefPtrWillBeMember<ImageBitmapLoader> > m_pendingLoaders; |
+ PersistentHeapHashSetWillBeHeapHashSet<Member<ImageBitmapLoader> > m_pendingLoaders; |
}; |
} // namespace WebCore |