SkBitmap and SkPixelRef no longer need lock/unlock

content/common/cursors/webcursor_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 <stddef.h>
 
 #include "base/pickle.h"
 #include "build/build_config.h"
 #include "content/common/cursors/webcursor.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 204 matching lines @@
   // Custom Windows message.
   ok_custom_pickle.WriteUInt32(0);
   base::PickleIterator iter(ok_custom_pickle);
   EXPECT_TRUE(custom_cursor.Deserialize(&iter));
 }
 
 TEST(WebCursorTest, AlphaConversion) {
   SkBitmap bitmap;
   SkPMColor testColor = SkPreMultiplyARGB(10, 255, 255, 255);
   bitmap.allocN32Pixels(1,1);
-  SkAutoLockPixels bitmap_lock(bitmap);
   *bitmap.getAddr32(0, 0) = testColor;
   CursorInfo cursor_info;
   cursor_info.type = WebCursorInfo::kTypeCustom;
   cursor_info.custom_image = bitmap;
   cursor_info.image_scale_factor = 1;
   WebCursor custom_cursor;
 
   // This round trip will convert the cursor to unpremultiplied form.
   custom_cursor.InitFromCursorInfo(cursor_info);
   custom_cursor.GetCursorInfo(&cursor_info);
-  {
-    SkAutoLockPixels lock(cursor_info.custom_image);
-    EXPECT_EQ(kUnpremul_SkAlphaType, cursor_info.custom_image.alphaType());
-    EXPECT_EQ(testColor,
-              SkPreMultiplyColor(*cursor_info.custom_image.getAddr32(0,0)));
-  }
+  EXPECT_EQ(kUnpremul_SkAlphaType, cursor_info.custom_image.alphaType());
+  EXPECT_EQ(testColor,
+            SkPreMultiplyColor(*cursor_info.custom_image.getAddr32(0, 0)));
 
   // Second round trip should not do any conversion because data is already
   // unpremultiplied.
   custom_cursor.InitFromCursorInfo(cursor_info);
   custom_cursor.GetCursorInfo(&cursor_info);
-  {
-    SkAutoLockPixels lock(cursor_info.custom_image);
-    EXPECT_EQ(kUnpremul_SkAlphaType, cursor_info.custom_image.alphaType());
-    EXPECT_EQ(testColor,
-              SkPreMultiplyColor(*cursor_info.custom_image.getAddr32(0,0)));
-  }
+  EXPECT_EQ(kUnpremul_SkAlphaType, cursor_info.custom_image.alphaType());
+  EXPECT_EQ(testColor,
+            SkPreMultiplyColor(*cursor_info.custom_image.getAddr32(0, 0)));
 
 #if defined(OS_MACOSX)
   // On MacOS, test roundtrip through NSCursor conversion.
   WebCursor custom_cursor_copy;
   custom_cursor_copy.InitFromNSCursor(custom_cursor.GetNativeCursor());
   custom_cursor_copy.GetCursorInfo(&cursor_info);
-  {
-    SkAutoLockPixels lock(cursor_info.custom_image);
-    EXPECT_EQ(kUnpremul_SkAlphaType, cursor_info.custom_image.alphaType());
-    EXPECT_EQ(testColor,
-              SkPreMultiplyColor(*cursor_info.custom_image.getAddr32(0,0)));
-  }
+  EXPECT_EQ(kUnpremul_SkAlphaType, cursor_info.custom_image.alphaType());
+  EXPECT_EQ(testColor,
+            SkPreMultiplyColor(*cursor_info.custom_image.getAddr32(0, 0)));
 #endif
 }
 
 #if defined(USE_AURA)
 TEST(WebCursorTest, CursorScaleFactor) {
   display::Display display;
   display.set_device_scale_factor(80.2f);
 
   CursorInfo info;
   info.image_scale_factor = 2.0f;
@@ skipping 76 matching lines @@
 }  // namespace
 
 TEST(WebCursorTest, WindowsCursorScaledAtHiDpi) {
   ScaleCursor(2.0f, 4, 6);
   ScaleCursor(1.5f, 2, 8);
   ScaleCursor(1.25f, 3, 7);
 }
 #endif
 
 }  // namespace content