Enable gfx::Image to be created from empty platform images.

ui/gfx/image/image.cc

 // 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.
 
 #include "ui/gfx/image/image.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 297 matching lines @@
 Image::Image() {
   // |storage_| is NULL for empty Images.
 }
 
 Image::Image(const unsigned char* png, size_t input_size)
     : storage_(new internal::ImageStorage(Image::kImageRepPNG)) {
   internal::ImageRepPNG* rep = new internal::ImageRepPNG(png, input_size);
   AddRepresentation(rep);
 }
 
-Image::Image(const ImageSkia& image)
-    : storage_(new internal::ImageStorage(Image::kImageRepSkia)) {
-  internal::ImageRepSkia* rep = new internal::ImageRepSkia(
-      new ImageSkia(image));
-  AddRepresentation(rep);
+Image::Image(const ImageSkia& image) {
+  if (!image.isNull()) {
+    storage_ = new internal::ImageStorage(Image::kImageRepSkia);
+    internal::ImageRepSkia* rep = new internal::ImageRepSkia(
+        new ImageSkia(image));
+    AddRepresentation(rep);
+  }
 }
 
-Image::Image(const SkBitmap& bitmap)
-    : storage_(new internal::ImageStorage(Image::kImageRepSkia)) {
-  internal::ImageRepSkia* rep =
-      new internal::ImageRepSkia(new ImageSkia(bitmap));
-  AddRepresentation(rep);
+Image::Image(const SkBitmap& bitmap) {
+  if (!bitmap.empty()) {
+    storage_ = new internal::ImageStorage(Image::kImageRepSkia);
+    internal::ImageRepSkia* rep =
+        new internal::ImageRepSkia(new ImageSkia(bitmap));
+    AddRepresentation(rep);
+  }
 }
 
 #if defined(TOOLKIT_GTK)
-Image::Image(GdkPixbuf* pixbuf)
-    : storage_(new internal::ImageStorage(Image::kImageRepGdk)) {
-  internal::ImageRepGdk* rep = new internal::ImageRepGdk(pixbuf);
-  AddRepresentation(rep);
+Image::Image(GdkPixbuf* pixbuf) {
+  if (pixbuf) {
+    storage_ = new internal::ImageStorage(Image::kImageRepGdk);
+    internal::ImageRepGdk* rep = new internal::ImageRepGdk(pixbuf);
+    AddRepresentation(rep);
+  }
 }
 #endif
 
 #if defined(OS_MACOSX)
-Image::Image(NSImage* image)
-    : storage_(new internal::ImageStorage(Image::kImageRepCocoa)) {
-  internal::ImageRepCocoa* rep = new internal::ImageRepCocoa(image);
-  AddRepresentation(rep);
+Image::Image(NSImage* image) {
+  if (image) {
+    storage_ = new internal::ImageStorage(Image::kImageRepCocoa);
+    internal::ImageRepCocoa* rep = new internal::ImageRepCocoa(image);
+    AddRepresentation(rep);
+  }
 }
 #endif
 
 Image::Image(const Image& other) : storage_(other.storage_) {
 }
 
 Image& Image::operator=(const Image& other) {
   storage_ = other.storage_;
   return *this;
 }
@@ skipping 236 matching lines @@
   }
   return it->second;
 }
 
 void Image::AddRepresentation(internal::ImageRep* rep) const {
   CHECK(storage_.get());
   storage_->representations().insert(std::make_pair(rep->type(), rep));
 }
 
 }  // namespace gfx