Makes ImageSkia more like SkBitmap

ui/gfx/image/image.cc

Index: ui/gfx/image/image.cc
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
index e748dd998cbf786e55197dd522a48e02b46264ba..18f808f75925c86ccb1bcad799d17cff130d9ecf 100644
--- a/ui/gfx/image/image.cc
+++ b/ui/gfx/image/image.cc
@@ -31,7 +31,8 @@ namespace internal {
 #if defined(OS_MACOSX)
 // This is a wrapper around gfx::NSImageToSkBitmap() because this cross-platform
 // file cannot include the [square brackets] of ObjC.
-bool NSImageToSkBitmaps(NSImage* image, std::vector<const SkBitmap*>* bitmaps);
+bool NSImageToImageSkia(NSImage* image, ImageSkia* image_skia);
+NSImage* ImageSkiaToNSImage(const ImageSkia* image);
 #endif
 
 #if defined(TOOLKIT_GTK)
@@ -97,9 +98,10 @@ class ImageRep {
 
 class ImageRepSkia : public ImageRep {
  public:
-  explicit ImageRepSkia(ImageSkia* image)
+  // Takes ownership of |image|.
+  explicit ImageRepSkia(const ImageSkia& image)
       : ImageRep(Image::kImageRepSkia),
-        image_(image) {
+        image_(new ImageSkia(image)) {
   }
 
   virtual ~ImageRepSkia() {
@@ -224,24 +226,22 @@ Image::Image() {
   // |storage_| is NULL for empty Images.
 }
 
-Image::Image(const SkBitmap* bitmap)
+Image::Image(const ImageSkia& image)
     : storage_(new internal::ImageStorage(Image::kImageRepSkia)) {
-  internal::ImageRepSkia* rep = new internal::ImageRepSkia(
-      new ImageSkia(bitmap));
+  internal::ImageRepSkia* rep = new internal::ImageRepSkia(image);
   AddRepresentation(rep);
 }
 
-Image::Image(const SkBitmap& bitmap)
+Image::Image(const SkBitmap* bitmap)
     : storage_(new internal::ImageStorage(Image::kImageRepSkia)) {
-  internal::ImageRepSkia* rep =
-      new internal::ImageRepSkia(new ImageSkia(new SkBitmap(bitmap)));
+  internal::ImageRepSkia* rep = new internal::ImageRepSkia(ImageSkia(bitmap));
   AddRepresentation(rep);
 }
 
-Image::Image(const std::vector<const SkBitmap*>& bitmaps)
+Image::Image(const SkBitmap& bitmap)

[Robert Sesek, 2012/05/05 02:08:34]

Is this ctor going away? If not, you could probably avoid an extra copy in this
case by having ImageRepSkia take a pointer instead of a reference.

     : storage_(new internal::ImageStorage(Image::kImageRepSkia)) {
-  internal::ImageRepSkia* rep = new internal::ImageRepSkia(
-    new ImageSkia(bitmaps));
+  internal::ImageRepSkia* rep =
+      new internal::ImageRepSkia(ImageSkia(new SkBitmap(bitmap)));
   AddRepresentation(rep);
 }
 
@@ -274,7 +274,7 @@ Image::~Image() {
 
 const SkBitmap* Image::ToSkBitmap() const {
   internal::ImageRep* rep = GetRepresentation(Image::kImageRepSkia);
-  return rep->AsImageRepSkia()->image()->bitmaps()[0];
+  return &rep->AsImageRepSkia()->image()->bitmaps()[0];
 }
 
 const ImageSkia* Image::ToImageSkia() const {
@@ -301,6 +301,10 @@ NSImage* Image::ToNSImage() const {
 }
 #endif
 
+ImageSkia* Image::CopyImageSkia() const {
+  return new ImageSkia(*ToImageSkia());
+}
+
 SkBitmap* Image::CopySkBitmap() const {
   return new SkBitmap(*ToSkBitmap());
 }
@@ -386,9 +390,9 @@ internal::ImageRep* Image::GetRepresentation(
 #elif defined(OS_MACOSX)
     if (storage_->default_representation_type() == Image::kImageRepCocoa) {
       internal::ImageRepCocoa* nsimage_rep = default_rep->AsImageRepCocoa();
-      std::vector<const SkBitmap*> bitmaps;
-      CHECK(internal::NSImageToSkBitmaps(nsimage_rep->image(), &bitmaps));
-      rep = new internal::ImageRepSkia(new ImageSkia(bitmaps));
+      ImageSkia image_skia;
+      CHECK(internal::NSImageToImageSkia(nsimage_rep->image(), &image_skia));
+      rep = new internal::ImageRepSkia(image_skia);
     }
 #endif
     CHECK(rep);
@@ -417,13 +421,13 @@ internal::ImageRep* Image::GetRepresentation(
 #elif defined(TOOLKIT_GTK)
     if (rep_type == Image::kImageRepGdk) {
       GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(
-          default_rep->AsImageRepSkia()->image()->bitmaps()[0]);
+          &default_rep->AsImageRepSkia()->image()->bitmaps()[0]);
       native_rep = new internal::ImageRepGdk(pixbuf);
     }
 #elif defined(OS_MACOSX)
     if (rep_type == Image::kImageRepCocoa) {
-      NSImage* image = gfx::SkBitmapsToNSImage(
-          default_rep->AsImageRepSkia()->image()->bitmaps());
+      NSImage* image = internal::ImageSkiaToNSImage(
+          default_rep->AsImageRepSkia()->image());
       base::mac::NSObjectRetain(image);
       native_rep = new internal::ImageRepCocoa(image);
     }