summaryrefslogtreecommitdiffstats
path: root/ash/wm/image_grid_unittest.cc
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-15 03:28:29 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-15 03:28:29 +0000
commit12c7da12c76dfdd58e9a5fc2ed77b319dfd2c96d (patch)
treec8b03dacda19d343c7dfc33ad72e4c273f808462 /ash/wm/image_grid_unittest.cc
parente7a8cbd4d4d389e666d5d3c372bb5d09a63b829b (diff)
downloadchromium_src-12c7da12c76dfdd58e9a5fc2ed77b319dfd2c96d.zip
chromium_src-12c7da12c76dfdd58e9a5fc2ed77b319dfd2c96d.tar.gz
chromium_src-12c7da12c76dfdd58e9a5fc2ed77b319dfd2c96d.tar.bz2
Revert 136812 - Get rid of Image::Image(SkBitmap*)
Bug=124566 Test=Compiles on CrOS,Mac Review URL: https://chromiumcodereview.appspot.com/10378009 TBR=pkotwicz@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136813 Review URL: https://chromiumcodereview.appspot.com/10383153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/image_grid_unittest.cc')
-rw-r--r--ash/wm/image_grid_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/image_grid_unittest.cc b/ash/wm/image_grid_unittest.cc
index 715ddb9..cf533b5 100644
--- a/ash/wm/image_grid_unittest.cc
+++ b/ash/wm/image_grid_unittest.cc
@@ -17,8 +17,8 @@ namespace {
// Creates a gfx::Image with the requested dimensions.
gfx::Image* CreateImage(const gfx::Size& size) {
- SkBitmap* bitmap = new SkBitmap();
- bitmap->setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
+ SkBitmap bitmap;
+ bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
return new gfx::Image(bitmap);
}