SkBitmap and SkPixelRef no longer need lock/unlock

ui/gfx/color_analysis_unittest.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.
 
 #include "ui/gfx/color_analysis.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 81 matching lines @@
 
 const HSL kDefaultLowerBound = {-1, -1, 0.15};
 const HSL kDefaultUpperBound = {-1, -1, 0.85};
 
 // Creates a 1-dimensional png of the pixel colors found in |colors|.
 scoped_refptr<base::RefCountedMemory> CreateTestPNG(
     const std::vector<SkColor>& colors) {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(colors.size(), 1);
 
-  SkAutoLockPixels lock(bitmap);
   for (size_t i = 0; i < colors.size(); ++i) {
     bitmap.eraseArea(SkIRect::MakeXYWH(i, 0, 1, 1), colors[i]);
   }
   return gfx::Image::CreateFrom1xBitmap(bitmap).As1xPNGBytes();
 }
 
 class MockKMeanImageSampler : public KMeanImageSampler {
  public:
   MockKMeanImageSampler() : current_result_index_(0) {
   }
@@ skipping 29 matching lines @@
 // Return true if a color channel is approximately equal to an expected value.
 bool ChannelApproximatelyEqual(int expected, uint8_t channel) {
   return (abs(expected - static_cast<int>(channel)) <= 1);
 }
 
 // Compute minimal and maximal graylevel (or alphalevel) of the input |bitmap|.
 // |bitmap| has to be allocated and configured to kA8_Config.
 void Calculate8bitBitmapMinMax(const SkBitmap& bitmap,
                                uint8_t* min_gl,
                                uint8_t* max_gl) {
-  SkAutoLockPixels bitmap_lock(bitmap);
   DCHECK(bitmap.getPixels());
   DCHECK_EQ(bitmap.colorType(), kAlpha_8_SkColorType);
   DCHECK(min_gl);
   DCHECK(max_gl);
   *min_gl = std::numeric_limits<uint8_t>::max();
   *max_gl = std::numeric_limits<uint8_t>::min();
   for (int y = 0; y < bitmap.height(); ++y) {
     uint8_t* current_color = bitmap.getAddr8(0, y);
     for (int x = 0; x < bitmap.width(); ++x, ++current_color) {
       *min_gl = std::min(*min_gl, *current_color);
@@ skipping 391 matching lines @@
   bitmap = canvas.GetBitmap();
   expectations[1] = kPureGreen;
   for (size_t i = 0; i < arraysize(color_profiles); ++i) {
     EXPECT_EQ(expectations[i],
               CalculateProminentColorOfBitmap(bitmap, color_profiles[i].luma,
                                               color_profiles[i].saturation));
   }
 }
 
 }  // namespace color_utils