Chromium Code Reviews| Index: ui/gfx/image/image.h |
| diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h |
| index 1878f49941c9ada5b7e3f930e6e165f575ddab57..b3211d758a7b331d367ed8389ad404ef4a18d39c 100644 |
| --- a/ui/gfx/image/image.h |
| +++ b/ui/gfx/image/image.h |
| @@ -37,6 +37,7 @@ class ImageMacTest; |
| } |
| namespace gfx { |
| +class ImageSkia; |
| #if defined(TOOLKIT_GTK) |
| class CairoCachedSurface; |
| @@ -97,6 +98,8 @@ class UI_EXPORT Image { |
| // The returned result is a weak pointer owned by and scoped to the life of |
| // the Image. |
| const SkBitmap* ToSkBitmap() const; |
| + |
|
Robert Sesek
2012/04/16 16:06:01
nit: no blank line
|
| + const ImageSkia* ToImageSkia() const; |
|
sky
2012/04/16 14:35:27
Document ownership.
pkotwicz
2012/04/19 03:15:05
Ownership is documented in unmodified comment abov
|
| #if defined(TOOLKIT_GTK) |
| GdkPixbuf* ToGdkPixbuf() const; |
| CairoCachedSurface* const ToCairo() const; |
| @@ -124,16 +127,6 @@ class UI_EXPORT Image { |
| #endif |
| // --------------------------------------------------------------------------- |
| - // Gets the number of bitmaps in this image. This may cause a conversion |
| - // to a bitmap representation. Note, this function and GetSkBitmapAtIndex() |
| - // are primarily meant to be used by the theme provider. |
| - size_t GetNumberOfSkBitmaps() const; |
| - |
| - // Gets the bitmap at the given index. This may cause a conversion |
| - // to a bitmap representation. Note, the internal ordering of bitmaps is not |
| - // guaranteed. |
| - const SkBitmap* GetSkBitmapAtIndex(size_t index) const; |
| - |
| // Inspects the representations map to see if the given type exists. |
| bool HasRepresentation(RepresentationType type) const; |