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

Unified Diff: skia/ext/platform_canvas_unittest.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/pixel_ref_utils_unittest.cc ('k') | skia/ext/refptr_unittest.cc » ('j') | 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 3d8ef00fe630ca7973d37c56d631f5dc63e89c99..3b39b4477a185acc56b0fff4f0e800a8c3f44c08 100644
--- a/skia/ext/platform_canvas_unittest.cc
+++ b/skia/ext/platform_canvas_unittest.cc
@@ -414,7 +414,7 @@ TEST(PlatformBitmapTest, PlatformBitmap) {
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());
+ EXPECT_TRUE(platform_bitmap->GetBitmap().pixelRef()->unique());
*(platform_bitmap->GetBitmap().getAddr32(10, 20)) = 0xDEED1020;
*(platform_bitmap->GetBitmap().getAddr32(20, 30)) = 0xDEED2030;
@@ -422,8 +422,8 @@ TEST(PlatformBitmapTest, PlatformBitmap) {
SkBitmap sk_bitmap = platform_bitmap->GetBitmap();
sk_bitmap.lockPixels();
- EXPECT_EQ(2, platform_bitmap->GetBitmap().pixelRef()->getRefCnt());
- EXPECT_EQ(2, sk_bitmap.pixelRef()->getRefCnt());
+ EXPECT_FALSE(platform_bitmap->GetBitmap().pixelRef()->unique());
+ EXPECT_FALSE(sk_bitmap.pixelRef()->unique());
EXPECT_EQ(0xDEED1020, *sk_bitmap.getAddr32(10, 20));
EXPECT_EQ(0xDEED2030, *sk_bitmap.getAddr32(20, 30));
@@ -434,7 +434,7 @@ TEST(PlatformBitmapTest, PlatformBitmap) {
// the PlatformBitmap.
platform_bitmap.reset();
- EXPECT_EQ(1, sk_bitmap.pixelRef()->getRefCnt());
+ EXPECT_TRUE(sk_bitmap.pixelRef()->unique());
EXPECT_EQ(0xDEED1020, *sk_bitmap.getAddr32(10, 20));
EXPECT_EQ(0xDEED2030, *sk_bitmap.getAddr32(20, 30));
« no previous file with comments | « skia/ext/pixel_ref_utils_unittest.cc ('k') | skia/ext/refptr_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698