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

Unified Diff: skia/ext/platform_canvas_unittest.cc

Issue 382623002: SkBitmap::Config is no more, use SkColorType (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missed some for chromeos and win 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/ext/image_operations.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/platform_canvas_unittest.cc
diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc
index a9ae148af4f89e7096c5a0ddf42a9adbbe22e398..2089755a2a19442b31ea635669c91eba571d6fc3 100644
--- a/skia/ext/platform_canvas_unittest.cc
+++ b/skia/ext/platform_canvas_unittest.cc
@@ -413,8 +413,8 @@ TEST(PlatformBitmapTest, PlatformBitmap) {
EXPECT_EQ(kHeight, platform_bitmap->GetBitmap().height());
EXPECT_LE(static_cast<size_t>(platform_bitmap->GetBitmap().width()*4),
platform_bitmap->GetBitmap().rowBytes());
- EXPECT_EQ(SkBitmap::kARGB_8888_Config, // Same for all platforms.
- platform_bitmap->GetBitmap().config());
+ EXPECT_EQ(kN32_SkColorType, // Same for all platforms.
+ platform_bitmap->GetBitmap().colorType());
EXPECT_TRUE(platform_bitmap->GetBitmap().lockPixelsAreWritable());
EXPECT_TRUE(platform_bitmap->GetBitmap().pixelRef()->isLocked());
EXPECT_EQ(1, platform_bitmap->GetBitmap().pixelRef()->getRefCnt());
« no previous file with comments | « skia/ext/image_operations.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698