SkBitmap and SkPixelRef no longer need lock/unlock

components/display_compositor/gl_helper_unittest.cc

 // Copyright 2016 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 <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <cmath>
 #include <string>
@@ skipping 718 matching lines @@
     // Step 2: Encode to grayscale if needed.
     if (out_color_type == kAlpha_8_SkColorType) {
       truth_pixels.allocPixels(SkImageInfo::Make(
           scaled_xsize, scaled_ysize, out_color_type, kPremul_SkAlphaType));
       EncodeToGrayscaleSlow(&scaled_pixels, &truth_pixels);
     } else {
       truth_pixels = scaled_pixels;
     }
 
     // Now compare the results.
-    SkAutoLockPixels lock_input(truth_pixels);
     const std::vector<GLHelperScaling::ScalerStage> dummy_stages;
     Compare(&truth_pixels, &output_pixels, 2, input_pixels.get(), dummy_stages,
             message + " comparing against transformed/scaled");
 
     gl_->DeleteTextures(1, &src_texture);
     gl_->DeleteFramebuffers(1, &framebuffer);
   }
 
   // Scaling test: Create a test image, scale it using GLHelperScaling
   // and a reference implementation and compare the results.
@@ skipping 204 matching lines @@
   bool IsEqual(const SkBitmap& bmp1, const SkBitmap& bmp2) {
     if (bmp1.isNull() && bmp2.isNull())
       return true;
     if (bmp1.width() != bmp2.width() || bmp1.height() != bmp2.height()) {
       LOG(ERROR) << "Bitmap geometry check failure";
       return false;
     }
     if (bmp1.colorType() != bmp2.colorType())
       return false;
 
-    SkAutoLockPixels lock1(bmp1);
-    SkAutoLockPixels lock2(bmp2);
     if (!bmp1.getPixels() || !bmp2.getPixels()) {
       LOG(ERROR) << "Empty Bitmap!";
       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),
                          bmp1.colorType())) {
           LOG(ERROR) << "Bitmap color comparision failure";
           return false;
@@ skipping 452 matching lines @@
     }
   }
 }
 
 TEST_F(GLHelperTest, CheckOptimizations) {
   // Test in baseclass since it is friends with GLHelperScaling
   CheckOptimizationsTest();
 }
 
 }  // namespace display_compositor