Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1241)

Unified Diff: Source/core/page/ImageBitmap.h

Issue 19393004: Allow eviction of ImageBitmaps that are created from ImageElements. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use CachedImage as the backing store for ImageBitmap. Implement O(1) decode cache. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/page/ImageBitmap.h
diff --git a/Source/core/page/ImageBitmap.h b/Source/core/page/ImageBitmap.h
index 8b8c01c740152758474622c112de18a4dcdc193b..39cdbfd6f603552a41955db122d51429310c8f62 100644
--- a/Source/core/page/ImageBitmap.h
+++ b/Source/core/page/ImageBitmap.h
@@ -6,8 +6,7 @@
#define ImageBitmap_h
#include "bindings/v8/ScriptWrappable.h"
-#include "core/dom/ScriptExecutionContext.h"
-#include "core/platform/graphics/BitmapImage.h"
+#include "core/loader/cache/CachedImage.h"
#include "core/platform/graphics/ImageBuffer.h"
#include "core/platform/graphics/IntRect.h"
#include "wtf/PassRefPtr.h"
@@ -19,42 +18,42 @@ class HTMLCanvasElement;
class HTMLImageElement;
class HTMLVideoElement;
class ImageData;
-class ImageBitmapCallback;
class ImageBitmap : public RefCounted<ImageBitmap>, public ScriptWrappable {
public:
- static PassRefPtr<ImageBitmap> create(HTMLImageElement*, IntRect);
- static PassRefPtr<ImageBitmap> create(HTMLVideoElement*, IntRect);
- static PassRefPtr<ImageBitmap> create(HTMLCanvasElement*, IntRect);
- static PassRefPtr<ImageBitmap> create(ImageData*, IntRect);
- static PassRefPtr<ImageBitmap> create(ImageBitmap*, IntRect);
+ 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&);
- BitmapImage* bitmapImage() const { return m_bitmap.get(); }
+ Image* bitmapImage() const { return m_bitmap->image(); }
+
+ int bitmapWidth() const { return m_bitmap->image()->width(); }
+ int bitmapHeight() const { return m_bitmap->image()->height(); }
+ IntSize bitmapSize() const { return m_bitmap->image()->size(); }
- int bitmapWidth() const { return m_bitmap->width(); }
- int bitmapHeight() const { return m_bitmap->height(); }
- IntSize bitmapSize() const { return m_bitmap->size(); }
IntPoint bitmapOffset() const { return m_bitmapOffset; }
- int width() const { return m_size.width(); }
- int height() const { return m_size.height(); }
- IntSize size() const { return m_size; }
+ int width() const { return m_cropRect.width(); }
+ int height() const { return m_cropRect.height(); }
+ IntSize size() const { return m_cropRect.size(); }
~ImageBitmap() { };
private:
- ImageBitmap(HTMLImageElement*, IntRect);
- ImageBitmap(HTMLVideoElement*, IntRect);
- ImageBitmap(HTMLCanvasElement*, IntRect);
- ImageBitmap(ImageData*, IntRect);
- ImageBitmap(ImageBitmap*, IntRect);
+ ImageBitmap(HTMLImageElement*, const IntRect&);
+ ImageBitmap(HTMLVideoElement*, const IntRect&);
+ ImageBitmap(HTMLCanvasElement*, const IntRect&);
+ ImageBitmap(ImageData*, const IntRect&);
+ ImageBitmap(ImageBitmap*, const IntRect&);
- RefPtr<BitmapImage> m_bitmap;
+ CachedImage* m_bitmap;
OwnPtr<ImageBuffer> m_buffer;
IntPoint m_bitmapOffset; // offset applied to the image when it is drawn to the context
- IntSize m_size; // user defined size of the ImageBitmap
+ IntRect m_cropRect;
};
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698