SkBitmap and SkPixelRef no longer need lock/unlock

content/browser/renderer_host/render_widget_host_view_browsertest.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 <stdint.h>
 #include <utility>
 
 #include "base/barrier_closure.h"
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 380 matching lines @@
 
   void ReadbackRequestCallbackTest(base::Closure quit_callback,
                                    const SkBitmap& bitmap,
                                    ReadbackResponse response) {
     readback_response_ = response;
     if (response != READBACK_SUCCESS) {
       quit_callback.Run();
       return;
     }
 
-    SkAutoLockPixels bitmap_lock(bitmap);
-
     // Check that the |bitmap| contains cyan and/or yellow pixels.  This is
     // needed because the compositor will read back "blank" frames until the
     // first frame from the renderer is composited.  See comments in
     // PerformTestWithLeftRightRects() for more details about eliminating test
     // flakiness.
     bool contains_a_test_color = false;
     for (int i = 0; i < bitmap.width(); ++i) {
       for (int j = 0; j < bitmap.height(); ++j) {
         if (!exclude_rect_.IsEmpty() && exclude_rect_.Contains(i, j))
           continue;
@@ skipping 18 matching lines @@
       quit_callback.Run();
       return;
     }
 
     // Compare the readback |bitmap| to the |expected_bitmap|, pixel-by-pixel.
     const SkBitmap& expected_bitmap =
         expected_copy_from_compositing_surface_bitmap_;
     EXPECT_EQ(expected_bitmap.width(), bitmap.width());
     EXPECT_EQ(expected_bitmap.height(), bitmap.height());
     EXPECT_EQ(expected_bitmap.colorType(), bitmap.colorType());
-    SkAutoLockPixels expected_bitmap_lock(expected_bitmap);
     int fails = 0;
     for (int i = 0; i < bitmap.width() && fails < 10; ++i) {
       for (int j = 0; j < bitmap.height() && fails < 10; ++j) {
         if (!exclude_rect_.IsEmpty() && exclude_rect_.Contains(i, j))
           continue;
 
         SkColor expected_color = expected_bitmap.getColor(i, j);
         SkColor color = bitmap.getColor(i, j);
         int expected_alpha = SkColorGetA(expected_color);
         int alpha = SkColorGetA(color);
@@ skipping 197 matching lines @@
     } while (readback_response_ != READBACK_SUCCESS);
   }
 
   // Sets up |bitmap| to have size |copy_size|. It floods the left half with
   // #0ff and the right half with #ff0.
   void SetupLeftRightBitmap(const gfx::Size& copy_size, SkBitmap* bitmap) {
     bitmap->allocN32Pixels(copy_size.width(), copy_size.height());
     // Left half is #0ff.
     bitmap->eraseARGB(255, 0, 255, 255);
     // Right half is #ff0.
-    {
-      SkAutoLockPixels lock(*bitmap);
-      for (int i = 0; i < copy_size.width() / 2; ++i) {
-        for (int j = 0; j < copy_size.height(); ++j) {
-          *(bitmap->getAddr32(copy_size.width() / 2 + i, j)) =
-              SkColorSetARGB(255, 255, 255, 0);
-        }
+    for (int i = 0; i < copy_size.width() / 2; ++i) {
+      for (int j = 0; j < copy_size.height(); ++j) {
+        *(bitmap->getAddr32(copy_size.width() / 2 + i, j)) =
+            SkColorSetARGB(255, 255, 255, 0);
       }
     }
   }
 
  protected:
   // Additional ReadbackResponse enum values only used within this test module,
   // to distinguish readback exception cases further.
   enum ExtraReadbackResponsesForTest {
     READBACK_NO_RESPONSE = -1337,
     READBACK_NO_TEST_COLORS,
@@ skipping 260 matching lines @@
                         kTestCompositingModes);
 INSTANTIATE_TEST_CASE_P(
     GLAndSoftwareCompositing,
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     kTestCompositingModes);
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 }  // namespace content