Expose array of bitmaps contained by gfx::Image similar to NSImage

ui/gfx/image/image.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // An Image wraps an image any flavor, be it platform-native GdkBitmap/NSImage,
 // or a SkBitmap. This also provides easy conversion to other image types
 // through operator overloading. It will cache the converted representations
 // internally to prevent double-conversion.
 //
 // The lifetime of both the initial representation and any converted ones are
@@ skipping 19 matching lines @@
 #include "ui/gfx/native_widget_types.h"
 
 class SkBitmap;
 
 namespace {
 class ImageTest;
 class ImageMacTest;
 }
 
 namespace gfx {
+class ImageSkia;
 
 #if defined(TOOLKIT_GTK)
 class CairoCachedSurface;
 #endif
 
 namespace internal {
 class ImageRep;
 class ImageStorage;
 }
 
@@ skipping 11 matching lines @@
   // Creates an empty image with no representations.
   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);
 

[Robert Sesek, 2012/04/16 16:06:01]

Should you be able to construct an Image with a ImageSkia? (See comment in
image_skia.h about use cases).

   // 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);
 #elif defined(OS_MACOSX)
   // Does not retain |image|; expects to take ownership.
   // A single NSImage object can contain multiple bitmaps so there's no reason
   // to pass a vector of these.
   explicit Image(NSImage* image);
 #endif
 
   // Initializes a new Image by AddRef()ing |other|'s internal storage.
   Image(const Image& other);
 
   // Copies a reference to |other|'s storage.
   Image& operator=(const Image& other);
 
   // Deletes the image and, if the only owner of the storage, all of its cached
   // representations.
   ~Image();
 
   // Converts the Image to the desired representation and stores it internally.
   // 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 above. The ownership of all the
"To" methods is the same. ie ToSkBitmap(), ToNSImage() etc

 #if defined(TOOLKIT_GTK)
   GdkPixbuf* ToGdkPixbuf() const;
   CairoCachedSurface* const ToCairo() const;
 #elif defined(OS_MACOSX)
   NSImage* ToNSImage() const;
 #endif
 
   // Performs a conversion, like above, but returns a copy of the result rather
   // than a weak pointer. The caller is responsible for deleting the result.
   // Note that the result is only a copy in terms of memory management; the
   // 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.
   SkBitmap* CopySkBitmap() const;
 #if defined(TOOLKIT_GTK)
   GdkPixbuf* CopyGdkPixbuf() const;
 #elif defined(OS_MACOSX)
   NSImage* CopyNSImage() const;
 #endif
 
   // DEPRECATED ----------------------------------------------------------------
   // Conversion handlers. These wrap the ToType() variants.
 #if defined(OS_MACOSX)
   operator NSImage*() const;
 #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;
 
   // Returns the number of representations.
   size_t RepresentationCount() const;
 
   // Returns true if this Image has no representations.
   bool IsEmpty() const;
 
   // Swaps this image's internal representations with |other|.
@@ skipping 14 matching lines @@
   // be cheaply copied.
   scoped_refptr<internal::ImageStorage> storage_;
 
   friend class ::ImageTest;
   friend class ::ImageMacTest;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_IMAGE_H_