Chromium Code Reviews| Index: ui/gfx/image/image.h |
| diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h |
| index 9c0e6eb9671cc9e7ef58fe572953986f9116a4c0..fffe35eb903b14968479ba7cd6ab4a2c6c819f00 100644 |
| --- a/ui/gfx/image/image.h |
| +++ b/ui/gfx/image/image.h |
| @@ -64,16 +64,16 @@ class UI_EXPORT Image { |
| // Creates a new image with the default representation. The object will take |
|
sky
2012/05/08 22:38:07
Remove second sentence since it isn't applicable a
|
| // ownership of the image. |
| + explicit Image(const ImageSkia& image); |
| + |
| + // Creates a new image with the default representation. The object will take |
| + // ownership of the image. |
| explicit Image(const SkBitmap* bitmap); |
| // Creates a new image by copying the bitmap for use as the default |
| // representation. |
| explicit Image(const SkBitmap& bitmap); |
| - // To create an Image that supports multiple resolutions pass a vector |
| - // of bitmaps, one for each resolution. |
| - explicit Image(const std::vector<const SkBitmap*>& bitmaps); |
| - |
| #if defined(TOOLKIT_GTK) |
| // Does not increase |pixbuf|'s reference count; expects to take ownership. |
| explicit Image(GdkPixbuf* pixbuf); |
| @@ -112,6 +112,7 @@ class UI_EXPORT Image { |
| // backing pixels are shared amongst all copies (a fact of each of the |
| // converted representations, rather than a limitation imposed by Image) and |
| // so the result should be considered immutable. |
| + ImageSkia* CopyImageSkia() const; |
| SkBitmap* CopySkBitmap() const; |
| #if defined(TOOLKIT_GTK) |
| GdkPixbuf* CopyGdkPixbuf() const; |