Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: ui/gfx/icon_util_unittest.cc

Issue 361643002: setConfig is deprecated, use setInfo or allocPixels instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't call allocPixels+rowbytes yet (skia bug) Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/icon_util.cc ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/icon_util.h" 5 #include "ui/gfx/icon_util.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 kSmallIconName); 273 kSmallIconName);
274 gfx::Size small_icon_size(kSmallIconWidth, kSmallIconHeight); 274 gfx::Size small_icon_size(kSmallIconWidth, kSmallIconHeight);
275 HICON small_icon = LoadIconFromFile(small_icon_filename, 275 HICON small_icon = LoadIconFromFile(small_icon_filename,
276 small_icon_size.width(), 276 small_icon_size.width(),
277 small_icon_size.height()); 277 small_icon_size.height());
278 ASSERT_NE(small_icon, static_cast<HICON>(NULL)); 278 ASSERT_NE(small_icon, static_cast<HICON>(NULL));
279 bitmap.reset(IconUtil::CreateSkBitmapFromHICON(small_icon, small_icon_size)); 279 bitmap.reset(IconUtil::CreateSkBitmapFromHICON(small_icon, small_icon_size));
280 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL)); 280 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
281 EXPECT_EQ(bitmap->width(), small_icon_size.width()); 281 EXPECT_EQ(bitmap->width(), small_icon_size.width());
282 EXPECT_EQ(bitmap->height(), small_icon_size.height()); 282 EXPECT_EQ(bitmap->height(), small_icon_size.height());
283 EXPECT_EQ(bitmap->colorType(), kPMColor_SkColorType); 283 EXPECT_EQ(bitmap->colorType(), kN32_SkColorType);
284 ::DestroyIcon(small_icon); 284 ::DestroyIcon(small_icon);
285 285
286 base::FilePath large_icon_filename = test_data_directory_.AppendASCII( 286 base::FilePath large_icon_filename = test_data_directory_.AppendASCII(
287 kLargeIconName); 287 kLargeIconName);
288 gfx::Size large_icon_size(kLargeIconWidth, kLargeIconHeight); 288 gfx::Size large_icon_size(kLargeIconWidth, kLargeIconHeight);
289 HICON large_icon = LoadIconFromFile(large_icon_filename, 289 HICON large_icon = LoadIconFromFile(large_icon_filename,
290 large_icon_size.width(), 290 large_icon_size.width(),
291 large_icon_size.height()); 291 large_icon_size.height());
292 ASSERT_NE(large_icon, static_cast<HICON>(NULL)); 292 ASSERT_NE(large_icon, static_cast<HICON>(NULL));
293 bitmap.reset(IconUtil::CreateSkBitmapFromHICON(large_icon, large_icon_size)); 293 bitmap.reset(IconUtil::CreateSkBitmapFromHICON(large_icon, large_icon_size));
294 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL)); 294 ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
295 EXPECT_EQ(bitmap->width(), large_icon_size.width()); 295 EXPECT_EQ(bitmap->width(), large_icon_size.width());
296 EXPECT_EQ(bitmap->height(), large_icon_size.height()); 296 EXPECT_EQ(bitmap->height(), large_icon_size.height());
297 EXPECT_EQ(bitmap->colorType(), kPMColor_SkColorType); 297 EXPECT_EQ(bitmap->colorType(), kN32_SkColorType);
298 ::DestroyIcon(large_icon); 298 ::DestroyIcon(large_icon);
299 } 299 }
300 300
301 // This test case makes sure that when an HICON is created from an SkBitmap, 301 // This test case makes sure that when an HICON is created from an SkBitmap,
302 // the returned handle is valid and refers to an icon with the expected 302 // the returned handle is valid and refers to an icon with the expected
303 // dimensions color depth etc. 303 // dimensions color depth etc.
304 TEST_F(IconUtilTest, TestBasicCreateHICONFromSkBitmap) { 304 TEST_F(IconUtilTest, TestBasicCreateHICONFromSkBitmap) {
305 SkBitmap bitmap = CreateBlackSkBitmap(kSmallIconWidth, kSmallIconHeight); 305 SkBitmap bitmap = CreateBlackSkBitmap(kSmallIconWidth, kSmallIconHeight);
306 HICON icon = IconUtil::CreateHICONFromSkBitmap(bitmap); 306 HICON icon = IconUtil::CreateHICONFromSkBitmap(bitmap);
307 EXPECT_NE(icon, static_cast<HICON>(NULL)); 307 EXPECT_NE(icon, static_cast<HICON>(NULL));
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 } 422 }
423 423
424 // This tests that kNumIconDimensionsUpToMediumSize has the correct value. 424 // This tests that kNumIconDimensionsUpToMediumSize has the correct value.
425 TEST_F(IconUtilTest, TestNumIconDimensionsUpToMediumSize) { 425 TEST_F(IconUtilTest, TestNumIconDimensionsUpToMediumSize) {
426 ASSERT_LE(IconUtil::kNumIconDimensionsUpToMediumSize, 426 ASSERT_LE(IconUtil::kNumIconDimensionsUpToMediumSize,
427 IconUtil::kNumIconDimensions); 427 IconUtil::kNumIconDimensions);
428 EXPECT_EQ(IconUtil::kMediumIconSize, 428 EXPECT_EQ(IconUtil::kMediumIconSize,
429 IconUtil::kIconDimensions[ 429 IconUtil::kIconDimensions[
430 IconUtil::kNumIconDimensionsUpToMediumSize - 1]); 430 IconUtil::kNumIconDimensionsUpToMediumSize - 1]);
431 } 431 }
OLDNEW
« no previous file with comments | « ui/gfx/icon_util.cc ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698