SkBitmap and SkPixelRef no longer need lock/unlock

ui/compositor/layer_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/compositor/layer.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 1165 matching lines @@
       SK_ColorBLUE, gfx::Rect(0, 0, viewport_size.width(), blue_height)));
 
   layer->Add(layer2.get());
 
   DrawTree(layer.get());
 
   SkBitmap bitmap;
   ReadPixels(&bitmap, gfx::Rect(viewport_size));
   ASSERT_FALSE(bitmap.empty());
 
-  SkAutoLockPixels lock(bitmap);
   for (int x = 0; x < viewport_size.width(); x++) {
     for (int y = 0; y < viewport_size.height(); y++) {
       SkColor actual_color = bitmap.getColor(x, y);
       SkColor expected_color = y < blue_height ? SK_ColorBLUE : SK_ColorRED;
       ExpectRgba(x, y, expected_color, actual_color);
     }
   }
 }
 
 // Checks that drawing a layer with transparent pixels is blended correctly
@@ skipping 17 matching lines @@
   // This must be set to false for layers with alpha to be blended correctly.
   foreground_layer->SetFillsBoundsOpaquely(false);
 
   background_layer->Add(foreground_layer.get());
   DrawTree(background_layer.get());
 
   SkBitmap bitmap;
   ReadPixels(&bitmap, gfx::Rect(viewport_size));
   ASSERT_FALSE(bitmap.empty());
 
-  SkAutoLockPixels lock(bitmap);
   for (int x = 0; x < test_size; x++) {
     for (int y = 0; y < test_size; y++) {
       SkColor actual_color = bitmap.getColor(x, y);
       ExpectRgba(x, y, blend_color, actual_color);
     }
   }
 }
 
 // Checks that using the AlphaShape filter applied to a layer with
 // transparency, alpha-blends properly with the layer below.
@@ skipping 20 matching lines @@
 
   foreground_layer->SetFillsBoundsOpaquely(false);
 
   background_layer->Add(foreground_layer.get());
   DrawTree(background_layer.get());
 
   SkBitmap bitmap;
   ReadPixels(&bitmap, gfx::Rect(viewport_size));
   ASSERT_FALSE(bitmap.empty());
 
-  SkAutoLockPixels lock(bitmap);
   for (int x = 0; x < test_size; x++) {
     for (int y = 0; y < test_size; y++) {
       SkColor actual_color = bitmap.getColor(x, y);
       ExpectRgba(x, y, actual_color,
                  y < blue_height ? blend_color : SK_ColorRED);
     }
   }
 }
 
 // Checks the logic around Compositor::SetRootLayer and Layer::SetCompositor.
@@ skipping 962 matching lines @@
   layer.set_name("foo");
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat> debug_info =
       layer.TakeDebugInfo(nullptr);
   std::string trace_format("bar,");
   debug_info->AppendAsTraceFormat(&trace_format);
   std::string expected("bar,{\"layer_name\":\"foo\"}");
   EXPECT_EQ(expected, trace_format);
 }
 
 }  // namespace ui