Index: Source/core/frame/ImageBitmap.h |
diff --git a/Source/core/frame/ImageBitmap.h b/Source/core/frame/ImageBitmap.h |
index 7f62bdaee9948f3105ad84c6f1f62e3ebe3ed015..edaa00ea780a55976cb7ecc7b8d4387aa8ef47ab 100644 |
--- a/Source/core/frame/ImageBitmap.h |
+++ b/Source/core/frame/ImageBitmap.h |
@@ -7,6 +7,7 @@ |
#include "bindings/v8/ScriptWrappable.h" |
#include "core/html/HTMLImageElement.h" |
+#include "heap/Handle.h" |
#include "platform/geometry/IntRect.h" |
#include "platform/graphics/Image.h" |
#include "wtf/PassRefPtr.h" |
@@ -18,15 +19,15 @@ class HTMLCanvasElement; |
class HTMLVideoElement; |
class ImageData; |
-class ImageBitmap FINAL : public RefCounted<ImageBitmap>, public ScriptWrappable, public ImageLoaderClient { |
- |
+class ImageBitmap FINAL : public RefCountedWillBeGarbageCollectedFinalized<ImageBitmap>, public ScriptWrappable, public ImageLoaderClient { |
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ImageBitmap); |
public: |
- static PassRefPtr<ImageBitmap> create(HTMLImageElement*, const IntRect&); |
- static PassRefPtr<ImageBitmap> create(HTMLVideoElement*, const IntRect&); |
- static PassRefPtr<ImageBitmap> create(HTMLCanvasElement*, const IntRect&); |
- static PassRefPtr<ImageBitmap> create(ImageData*, const IntRect&); |
- static PassRefPtr<ImageBitmap> create(ImageBitmap*, const IntRect&); |
- static PassRefPtr<ImageBitmap> create(Image*, const IntRect&); |
+ static PassRefPtrWillBeRawPtr<ImageBitmap> create(HTMLImageElement*, const IntRect&); |
+ static PassRefPtrWillBeRawPtr<ImageBitmap> create(HTMLVideoElement*, const IntRect&); |
+ static PassRefPtrWillBeRawPtr<ImageBitmap> create(HTMLCanvasElement*, const IntRect&); |
+ static PassRefPtrWillBeRawPtr<ImageBitmap> create(ImageData*, const IntRect&); |
+ static PassRefPtrWillBeRawPtr<ImageBitmap> create(ImageBitmap*, const IntRect&); |
+ static PassRefPtrWillBeRawPtr<ImageBitmap> create(Image*, const IntRect&); |
PassRefPtr<Image> bitmapImage() const; |
PassRefPtr<HTMLImageElement> imageElement() const { return m_imageElement; } |
@@ -40,6 +41,10 @@ public: |
virtual ~ImageBitmap(); |
+ void detach(); |
haraken
2014/03/10 15:25:03
detach => dispose.
attach/detach is normally used
sof
2014/03/10 21:07:21
Done.
|
+ |
+ virtual void trace(Visitor*); |
haraken
2014/03/10 15:25:03
Add OVERRIDE.
sof
2014/03/10 15:55:57
It's not overriding any other trace().
|
+ |
private: |
ImageBitmap(HTMLImageElement*, const IntRect&); |
ImageBitmap(HTMLVideoElement*, const IntRect&); |