SkBitmap and SkPixelRef no longer need lock/unlock

skia/ext/platform_canvas_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.
 
 // TODO(awalker): clean up the const/non-const reference handling in this test
 
 #include "skia/ext/platform_canvas.h"
 
 #include <stdint.h>
 
@@ skipping 40 matching lines @@
 }
 
 // Return true if the canvas is filled to canvas_color, and contains a single
 // rectangle filled to rect_color. This function ignores the alpha channel,
 // since Windows will sometimes clear the alpha channel when drawing, and we
 // will fix that up later in cases it's necessary.
 bool VerifyRect(const SkCanvas& canvas,
                 uint32_t canvas_color, uint32_t rect_color,
                 int x, int y, int w, int h) {
   const SkBitmap bitmap = skia::ReadPixels(const_cast<SkCanvas*>(&canvas));
-  SkAutoLockPixels lock(bitmap);
 
   for (int cur_y = 0; cur_y < bitmap.height(); cur_y++) {
     for (int cur_x = 0; cur_x < bitmap.width(); cur_x++) {
       if (cur_x >= x && cur_x < x + w &&
           cur_y >= y && cur_y < y + h) {
         // Inside the square should be rect_color
         if (!IsOfColor(bitmap, cur_x, cur_y, rect_color))
           return false;
       } else {
         // Outside the square should be canvas_color
@@ skipping 291 matching lines @@
   }
   canvas->restore();
   EXPECT_TRUE(VerifyRoundedRect(*canvas, SK_ColorWHITE, SK_ColorBLACK,
                                 kInnerX + 1, kInnerY + 1, kInnerW, kInnerH));
 #endif
 }
 
 }  // namespace skia
 
 #endif // defined(OS_WIN)