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

Unified Diff: ui/gfx/image/image_unittest.cc

Issue 2823003002: SkBitmap and SkPixelRef no longer need lock/unlock (Closed)
Patch Set: win fix after rebase Created 3 years, 8 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 | « ui/gfx/icon_util.cc ('k') | ui/gfx/image/image_unittest_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_unittest.cc
diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
index 641ccfa88c725eb5abed0e4aaf92f71e2f37b262..317e59830fddcc5303de88e929c711378a1272b7 100644
--- a/ui/gfx/image/image_unittest.cc
+++ b/ui/gfx/image/image_unittest.cc
@@ -506,7 +506,6 @@ TEST_F(ImageTest, CheckSkiaColor) {
gfx::Image image(gt::CreatePlatformImage());
const SkBitmap* bitmap = image.ToSkBitmap();
- SkAutoLockPixels auto_lock(*bitmap);
gt::CheckColors(bitmap->getColor(10, 10), SK_ColorGREEN);
}
@@ -544,7 +543,6 @@ TEST_F(ImageTest, SkBitmapConversionPreservesOrientation) {
// Force a conversion back to SkBitmap and check that the upper half is red.
gfx::Image from_platform(gt::CopyPlatformType(from_skbitmap));
const SkBitmap* bitmap2 = from_platform.ToSkBitmap();
- SkAutoLockPixels auto_lock(*bitmap2);
{
SCOPED_TRACE("Checking color after conversion back to SkBitmap");
gt::CheckColors(bitmap2->getColor(10, 10), SK_ColorRED);
@@ -585,7 +583,6 @@ TEST_F(ImageTest, SkBitmapConversionPreservesTransparency) {
// Force a conversion back to SkBitmap and check that the upper half is red.
gfx::Image from_platform(gt::CopyPlatformType(from_skbitmap));
const SkBitmap* bitmap2 = from_platform.ToSkBitmap();
- SkAutoLockPixels auto_lock(*bitmap2);
{
SCOPED_TRACE("Checking color after conversion back to SkBitmap");
gt::CheckColors(bitmap2->getColor(10, 10), SK_ColorRED);
« no previous file with comments | « ui/gfx/icon_util.cc ('k') | ui/gfx/image/image_unittest_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698