diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 05:48:54 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 05:48:54 +0000 |
| commit | 2b4f7e7be99649ad667ec6658448dcebc75ec124 (patch) | |
| tree | ae4ecaed0c7f891bd20a2f2e53229e9c082c605e /ash | |
| parent | 701d1e8389d6f6b93f557e0a73b79ccaea5b8ac6 (diff) | |
| download | chromium_src-2b4f7e7be99649ad667ec6658448dcebc75ec124.zip chromium_src-2b4f7e7be99649ad667ec6658448dcebc75ec124.tar.gz chromium_src-2b4f7e7be99649ad667ec6658448dcebc75ec124.tar.bz2 | |
Revert 136823 - Get rid of Image::Image(SkBitmap*); because of win build failure
Bug=124566
Test=Compiles on CrOS,Mac
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136812
Review URL: https://chromiumcodereview.appspot.com/10378009
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10392075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/image_grid_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/image_grid_unittest.cc b/ash/wm/image_grid_unittest.cc index cf533b5..715ddb9 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; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height()); + SkBitmap* bitmap = new SkBitmap(); + bitmap->setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height()); return new gfx::Image(bitmap); } |