ui/gfx/icon_util_unittest.cc - Issue 361643002: setConfig is deprecated, use setInfo or allocPixels instead

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 6 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:

Index: ui/gfx/icon_util_unittest.cc

diff --git a/ui/gfx/icon_util_unittest.cc b/ui/gfx/icon_util_unittest.cc

index 1e2e96297c28a2d860bff0280474f5d473bebf0d..2428023d5fb0f7419ec20551323d8a6172fb9b62 100644

--- a/ui/gfx/icon_util_unittest.cc

+++ b/ui/gfx/icon_util_unittest.cc

@@ -280,7 +280,7 @@ TEST_F(IconUtilTest, TestCreateSkBitmapFromHICON) {

ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));

EXPECT_EQ(bitmap->width(), small_icon_size.width());

EXPECT_EQ(bitmap->height(), small_icon_size.height());

- EXPECT_EQ(bitmap->colorType(), kPMColor_SkColorType);

+ EXPECT_EQ(bitmap->colorType(), kN32_SkColorType);

::DestroyIcon(small_icon);

base::FilePath large_icon_filename = test_data_directory_.AppendASCII(

@@ -294,7 +294,7 @@ TEST_F(IconUtilTest, TestCreateSkBitmapFromHICON) {

ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));

EXPECT_EQ(bitmap->width(), large_icon_size.width());

EXPECT_EQ(bitmap->height(), large_icon_size.height());

- EXPECT_EQ(bitmap->colorType(), kPMColor_SkColorType);

+ EXPECT_EQ(bitmap->colorType(), kN32_SkColorType);

::DestroyIcon(large_icon);

}

« no previous file with comments | « ui/gfx/icon_util.cc ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »