SkBitmap and SkPixelRef no longer need lock/unlock

cc/test/pixel_comparator.cc

 // Copyright (c) 2013 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 "cc/test/pixel_comparator.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
@@ skipping 10 matching lines @@
                                    const SkBitmap& expected_bmp) const {
   // Number of pixels with an error
   int error_pixels_count = 0;
 
   gfx::Rect error_bounding_rect = gfx::Rect();
 
   // Check that bitmaps have identical dimensions.
   DCHECK(actual_bmp.width() == expected_bmp.width() &&
          actual_bmp.height() == expected_bmp.height());
 
-  SkAutoLockPixels lock_actual_bmp(actual_bmp);
-  SkAutoLockPixels lock_expected_bmp(expected_bmp);
-
   for (int x = 0; x < actual_bmp.width(); ++x) {
     for (int y = 0; y < actual_bmp.height(); ++y) {
       SkColor actual_color = actual_bmp.getColor(x, y);
       SkColor expected_color = expected_bmp.getColor(x, y);
       if (discard_alpha_) {
         actual_color = SkColorSetA(actual_color, 0);
         expected_color = SkColorSetA(expected_color, 0);
       }
       if (actual_color != expected_color) {
         ++error_pixels_count;
@@ skipping 45 matching lines @@
 
   gfx::Rect error_bounding_rect = gfx::Rect();
 
   // Check that bitmaps have identical dimensions.
   DCHECK(actual_bmp.width() == expected_bmp.width() &&
          actual_bmp.height() == expected_bmp.height());
 
   // Check that bitmaps are not empty.
   DCHECK(actual_bmp.width() > 0 && actual_bmp.height() > 0);
 
-  SkAutoLockPixels lock_actual_bmp(actual_bmp);
-  SkAutoLockPixels lock_expected_bmp(expected_bmp);
-
   for (int x = 0; x < actual_bmp.width(); ++x) {
     for (int y = 0; y < actual_bmp.height(); ++y) {
       SkColor actual_color = actual_bmp.getColor(x, y);
       SkColor expected_color = expected_bmp.getColor(x, y);
       if (discard_alpha_) {
         actual_color = SkColorSetA(actual_color, 0);
         expected_color = SkColorSetA(expected_color, 0);
       }
 
       if (actual_color != expected_color) {
@@ skipping 91 matching lines @@
         }
       }
       LOG(ERROR) << "Error Bounding Box : " << error_bounding_rect.ToString();
     return false;
   } else {
     return true;
   }
 }
 
 }  // namespace cc