From 9da1c28e5e5401d01d87ffce74ceefacc8ff47c3 Mon Sep 17 00:00:00 2001
From: "pkotwicz@chromium.org"
<pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 9 Oct 2012 18:21:21 +0000
Subject: Make gfx::ImageSkia(gfx::ImageSkiaRep) explicit
BUG=None
Test=None
R=oshima
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/11023005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160878 0039d316-1c4b-4281-b951-d872f2087c98
---
ui/gfx/image/image_skia.h | 2 +-
ui/gfx/image/image_unittest.cc | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
(limited to 'ui/gfx')
diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h
index 9b79ab6..2dfc131 100644
--- a/ui/gfx/image/image_skia.h
+++ b/ui/gfx/image/image_skia.h
@@ -51,7 +51,7 @@ class UI_EXPORT ImageSkia {
// done.
ImageSkia(const SkBitmap& bitmap);
- ImageSkia(const gfx::ImageSkiaRep& image_rep);
+ explicit ImageSkia(const gfx::ImageSkiaRep& image_rep);
// Copies a reference to |other|'s storage.
ImageSkia(const ImageSkia& other);
diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
index 0ad95ae..1f4fd4c 100644
--- a/ui/gfx/image/image_unittest.cc
+++ b/ui/gfx/image/image_unittest.cc
@@ -456,7 +456,8 @@ TEST_F(ImageTest, OwnershipTest) {
{
SkBitmap bitmap(gt::CreateBitmap(10, 10));
EXPECT_TRUE(!bitmap.isNull());
- image = gfx::Image(gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));
+ image = gfx::Image(gfx::ImageSkia(
+ gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P)));
}
EXPECT_TRUE(!image.ToSkBitmap()->isNull());
}
--
cgit v1.1