SkBitmap and SkPixelRef no longer need lock/unlock

ui/gfx/image/image_unittest_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Because the unit tests for gfx::Image are spread across multiple
 // implementation files, this header contains the reusable components.
 
 #include "ui/gfx/image/image_unittest_util.h"
 
 #include <stddef.h>
@@ skipping 119 matching lines @@
   if (bmp1.isNull() && bmp2.isNull())
     return true;
 
   if (bmp1.width() != bmp2.width() ||
       bmp1.height() != bmp2.height() ||
       bmp1.colorType() != kN32_SkColorType ||
       bmp2.colorType() != kN32_SkColorType) {
     return false;
   }
 
-  SkAutoLockPixels lock1(bmp1);
-  SkAutoLockPixels lock2(bmp2);
   if (!bmp1.getPixels() || !bmp2.getPixels())
     return false;
 
   for (int y = 0; y < bmp1.height(); ++y) {
     for (int x = 0; x < bmp1.width(); ++x) {
       if (!ColorsClose(bmp1.getColor(x,y), bmp2.getColor(x,y), max_deviation))
         return false;
     }
   }
 
@@ skipping 15 matching lines @@
 
 int MaxColorSpaceConversionColorShift() {
   return kMaxColorSpaceConversionColorShift;
 }
 
 void CheckImageIndicatesPNGDecodeFailure(const gfx::Image& image) {
   SkBitmap bitmap = image.AsBitmap();
   EXPECT_FALSE(bitmap.isNull());
   EXPECT_LE(16, bitmap.width());
   EXPECT_LE(16, bitmap.height());
-  SkAutoLockPixels auto_lock(bitmap);
   CheckColors(bitmap.getColor(10, 10), SK_ColorRED);
 }
 
 bool ImageSkiaStructureMatches(
     const gfx::ImageSkia& image_skia,
     int width,
     int height,
     const std::vector<float>& scales) {
   if (image_skia.isNull() ||
       image_skia.width() != width ||
@@ skipping 76 matching lines @@
   return image.CopyNSImage();
 #else
   return image.AsImageSkia();
 #endif
 }
 
 #if defined(OS_MACOSX)
 // Defined in image_unittest_util_mac.mm.
 #else
 SkColor GetPlatformImageColor(PlatformImage image, int x, int y) {
-  SkBitmap bitmap = *image.bitmap();
-  SkAutoLockPixels auto_lock(bitmap);
-  return bitmap.getColor(x, y);
+  return image.bitmap()->getColor(x, y);
 }
 #endif
 
 void CheckColors(SkColor color1, SkColor color2) {
   EXPECT_TRUE(ColorsClose(color1, color2, MaxColorSpaceConversionColorShift()));
 }
 
 void CheckIsTransparent(SkColor color) {
   EXPECT_LT(SkColorGetA(color) / 255.0, 0.05);
 }
 
 bool IsPlatformImageValid(PlatformImage image) {
 #if defined(OS_MACOSX)
   return image != NULL;
 #else
   return !image.isNull();
 #endif
 }
 
 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2) {
 #if defined(OS_MACOSX)
   return image1 == image2;
 #else
   return image1.BackedBySameObjectAs(image2);
 #endif
 }
 
 }  // namespace test
 }  // namespace gfx