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

Side by Side Diff: Source/core/page/ImageBitmap.h

Issue 19705006: Use SkImage as a backing store for copying 2d Contexts to ImageBitmaps. Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Change SkImage to use srcRect pointer. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ImageBitmap_h 5 #ifndef ImageBitmap_h
6 #define ImageBitmap_h 6 #define ImageBitmap_h
7 7
8 #include "bindings/v8/ScriptWrappable.h" 8 #include "bindings/v8/ScriptWrappable.h"
9 #include "core/dom/ScriptExecutionContext.h" 9 #include "core/dom/ScriptExecutionContext.h"
10 #include "core/platform/graphics/BitmapImage.h" 10 #include "core/platform/graphics/BitmapImage.h"
(...skipping 12 matching lines...) Expand all
23 23
24 class ImageBitmap : public RefCounted<ImageBitmap>, public ScriptWrappable { 24 class ImageBitmap : public RefCounted<ImageBitmap>, public ScriptWrappable {
25 25
26 public: 26 public:
27 static PassRefPtr<ImageBitmap> create(HTMLImageElement*, IntRect); 27 static PassRefPtr<ImageBitmap> create(HTMLImageElement*, IntRect);
28 static PassRefPtr<ImageBitmap> create(HTMLVideoElement*, IntRect); 28 static PassRefPtr<ImageBitmap> create(HTMLVideoElement*, IntRect);
29 static PassRefPtr<ImageBitmap> create(HTMLCanvasElement*, IntRect); 29 static PassRefPtr<ImageBitmap> create(HTMLCanvasElement*, IntRect);
30 static PassRefPtr<ImageBitmap> create(ImageData*, IntRect); 30 static PassRefPtr<ImageBitmap> create(ImageData*, IntRect);
31 static PassRefPtr<ImageBitmap> create(ImageBitmap*, IntRect); 31 static PassRefPtr<ImageBitmap> create(ImageBitmap*, IntRect);
32 32
33 BitmapImage* bitmapImage() const { return m_bitmap.get(); } 33 PassRefPtr<Image> bitmapImage() const { return m_bitmap; }
34 bool derivedFromCanvas() const { return m_derivedFromCanvas; }
34 35
35 int bitmapWidth() const { return m_bitmap->width(); } 36 int bitmapWidth() const { return m_bitmapSize.width(); }
36 int bitmapHeight() const { return m_bitmap->height(); } 37 int bitmapHeight() const { return m_bitmapSize.height(); }
37 IntSize bitmapSize() const { return m_bitmap->size(); } 38 IntSize bitmapSize() const { return m_bitmapSize; }
38 IntPoint bitmapOffset() const { return m_bitmapOffset; } 39 IntPoint bitmapOffset() const { return m_bitmapOffset; }
39 40
40 int width() const { return m_size.width(); } 41 int width() const { return m_cropRect.width(); }
41 int height() const { return m_size.height(); } 42 int height() const { return m_cropRect.height(); }
42 IntSize size() const { return m_size; } 43 IntSize size() const { return m_cropRect.size(); }
44 IntRect cropRect() const { return m_cropRect; }
43 45
44 ~ImageBitmap() { }; 46 ~ImageBitmap() { };
45 47
46 private: 48 private:
47 ImageBitmap(HTMLImageElement*, IntRect); 49 ImageBitmap(HTMLImageElement*, IntRect);
48 ImageBitmap(HTMLVideoElement*, IntRect); 50 ImageBitmap(HTMLVideoElement*, IntRect);
49 ImageBitmap(HTMLCanvasElement*, IntRect); 51 ImageBitmap(HTMLCanvasElement*, IntRect);
50 ImageBitmap(ImageData*, IntRect); 52 ImageBitmap(ImageData*, IntRect);
51 ImageBitmap(ImageBitmap*, IntRect); 53 ImageBitmap(ImageBitmap*, IntRect);
52 54
53 RefPtr<BitmapImage> m_bitmap; 55 RefPtr<Image> m_bitmap;
Justin Novosad 2013/07/22 15:35:41 With what we've discussed, should this be CachedIm
54 OwnPtr<ImageBuffer> m_buffer; 56 OwnPtr<ImageBuffer> m_buffer;
55 57
56 IntPoint m_bitmapOffset; // offset applied to the image when it is drawn to the context 58 IntPoint m_bitmapOffset; // offset applied to the image when it is drawn to the context
57 IntSize m_size; // user defined size of the ImageBitmap 59 IntSize m_bitmapSize; // actual size of the BitmapImage
60 IntRect m_cropRect; // user defined size of the ImageBitmap
61
62 bool m_derivedFromCanvas;
58 }; 63 };
59 64
60 } // namespace WebCore 65 } // namespace WebCore
61 66
62 #endif // ImageBitmap_h 67 #endif // ImageBitmap_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698