SkBitmap and SkPixelRef no longer need lock/unlock

third_party/WebKit/Source/platform/graphics/GraphicsContextTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 30 matching lines @@
 namespace blink {
 
 #define EXPECT_EQ_RECT(a, b)       \
   EXPECT_EQ(a.x(), b.x());         \
   EXPECT_EQ(a.y(), b.y());         \
   EXPECT_EQ(a.width(), b.width()); \
   EXPECT_EQ(a.height(), b.height());
 
 #define EXPECT_OPAQUE_PIXELS_IN_RECT(bitmap, opaqueRect)         \
   {                                                              \
-    SkAutoLockPixels locker(bitmap);                             \
     for (int y = opaqueRect.Y(); y < opaqueRect.MaxY(); ++y)     \
       for (int x = opaqueRect.X(); x < opaqueRect.MaxX(); ++x) { \
         int alpha = *bitmap.getAddr32(x, y) >> 24;               \
         EXPECT_EQ(255, alpha);                                   \
       }                                                          \
   }
 
 #define EXPECT_OPAQUE_PIXELS_ONLY_IN_RECT(bitmap, opaqueRect) \
   {                                                           \
-    SkAutoLockPixels locker(bitmap);                          \
     for (int y = 0; y < bitmap.height(); ++y)                 \
       for (int x = 0; x < bitmap.width(); ++x) {              \
         int alpha = *bitmap.getAddr32(x, y) >> 24;            \
         bool opaque = opaqueRect.Contains(x, y);              \
         EXPECT_EQ(opaque, alpha == 255);                      \
       }                                                       \
   }
 
 TEST(GraphicsContextTest, Recording) {
   SkBitmap bitmap;
@@ skipping 65 matching lines @@
   PaintFlags flags;
   flags.setColor(alpha.Rgb());
   flags.setBlendMode(SkBlendMode::kSrcOut);
   context.DrawPath(path.GetSkPath(), flags);
 
   canvas.drawPicture(context.EndRecording());
   EXPECT_OPAQUE_PIXELS_IN_RECT(bitmap, IntRect(20, 10, 30, 40));
 }
 
 }  // namespace blink