ui/gfx: Remove the deprecated "operator const SkBitmap&" from Image API.

BUG=58030
R=rsesek@chromium.org
TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9834094

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129093 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 11 insertions, 16 deletions

diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
index 092047f..fbaf95ec 100644
--- a/ui/gfx/image/image.cc
+++ b/ui/gfx/image/image.cc
@@ -12,8 +12,8 @@
 #include "ui/gfx/size.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
 #include <glib-object.h>
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/gtk_util.h"
@@ -326,10 +326,6 @@ NSImage* Image::CopyNSImage() const {
 }
 #endif
 
-Image::operator const SkBitmap&() const {
-  return *ToSkBitmap();
-}
-
 #if defined(OS_MACOSX)
 Image::operator NSImage*() const {
   return ToNSImage();
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h
index cc4cc9b..3c2c05d 100644
--- a/ui/gfx/image/image.h
+++ b/ui/gfx/image/image.h
@@ -119,7 +119,6 @@ class UI_EXPORT Image {
 
   // DEPRECATED ----------------------------------------------------------------
   // Conversion handlers. These wrap the ToType() variants.
-  operator const SkBitmap&() const;
 #if defined(OS_MACOSX)
   operator NSImage*() const;
 #endif
diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
index a779f8c..0516523 100644
--- a/ui/gfx/image/image_unittest.cc
+++ b/ui/gfx/image/image_unittest.cc
@@ -82,8 +82,8 @@ TEST_F(ImageTest, SkiaRefToSkia) {
 TEST_F(ImageTest, SkiaToSkiaRef) {
   gfx::Image image(gt::CreateBitmap(25, 25));
 
-  const SkBitmap& bitmap = static_cast<const SkBitmap&>(image);
-  EXPECT_FALSE(bitmap.isNull());
+  const SkBitmap* bitmap = image.ToSkBitmap();
+  EXPECT_FALSE(bitmap->isNull());
   EXPECT_EQ(1U, image.RepresentationCount());
 
   const SkBitmap* bitmap1 = image.ToSkBitmap();
@@ -106,8 +106,8 @@ TEST_F(ImageTest, SkiaToPlatform) {
   EXPECT_TRUE(gt::ToPlatformType(image));
   EXPECT_EQ(kRepCount, image.RepresentationCount());
 
-  const SkBitmap& bitmap = static_cast<const SkBitmap&>(image);
-  EXPECT_FALSE(bitmap.isNull());
+  const SkBitmap* bitmap = image.ToSkBitmap();
+  EXPECT_FALSE(bitmap->isNull());
   EXPECT_EQ(kRepCount, image.RepresentationCount());
 
   EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepSkia));
@@ -198,10 +198,10 @@ TEST_F(ImageTest, SkiaToCocoaCopy) {
 
 TEST_F(ImageTest, CheckSkiaColor) {
   gfx::Image image(gt::CreatePlatformImage());
-  const SkBitmap& bitmap(image);
+  const SkBitmap* bitmap = image.ToSkBitmap();
 
-  SkAutoLockPixels auto_lock(bitmap);
-  uint32_t* pixel = bitmap.getAddr32(10, 10);
+  SkAutoLockPixels auto_lock(*bitmap);
+  uint32_t* pixel = bitmap->getAddr32(10, 10);
   EXPECT_EQ(SK_ColorRED, *pixel);
 }
 
diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc
index 314d4b5..4216629 100644
--- a/ui/gfx/image/image_util.cc
+++ b/ui/gfx/image/image_util.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -22,13 +22,13 @@ Image* ImageFromPNGEncodedData(const unsigned char* input, size_t input_size) {
 
 bool PNGEncodedDataFromImage(const Image& image,
                              std::vector<unsigned char>* dst) {
-  const SkBitmap& bitmap = image;
+  const SkBitmap& bitmap = *image.ToSkBitmap();
   return gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, dst);
 }
 
 bool JPEGEncodedDataFromImage(const Image& image, int quality,
                               std::vector<unsigned char>* dst) {
-  const SkBitmap& bitmap = image;
+  const SkBitmap& bitmap = *image.ToSkBitmap();
   SkAutoLockPixels bitmap_lock(bitmap);
 
   if (!bitmap.readyToDraw())