Makes ImageSkia more like SkBitmap

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 44 matching lines @@
     kImageRepCocoa,
     kImageRepCairoCache,
     kImageRepSkia,
   };
 
   typedef std::map<RepresentationType, internal::ImageRep*> RepresentationMap;
 
   // Creates an empty image with no representations.
   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 anymore.

   // 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);
 #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
 
@@ skipping 18 matching lines @@
 #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.
+  ImageSkia* CopyImageSkia() const;
   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)
@@ skipping 28 matching lines @@
   // be cheaply copied.
   scoped_refptr<internal::ImageStorage> storage_;
 
   friend class ::ImageTest;
   friend class ::ImageMacTest;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_IMAGE_H_