SkBitmap and SkPixelRef no longer need lock/unlock

third_party/WebKit/Source/web/tests/WebImageTest.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 32 matching lines @@
 
   return testing::ReadFromFile(file_path);
 }
 
 TEST(WebImageTest, PNGImage) {
   RefPtr<SharedBuffer> data = ReadFile("white-1x1.png");
   ASSERT_TRUE(data.Get());
 
   WebImage image = WebImage::FromData(WebData(data), WebSize());
   EXPECT_TRUE(image.Size() == WebSize(1, 1));
-  SkAutoLockPixels auto_lock(image.GetSkBitmap());
   EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255),
             image.GetSkBitmap().getColor(0, 0));
 }
 
 TEST(WebImageTest, ICOImage) {
   RefPtr<SharedBuffer> data = ReadFile("black-and-white.ico");
   ASSERT_TRUE(data.Get());
 
   WebVector<WebImage> images = WebImage::FramesFromData(WebData(data));
   ASSERT_EQ(2u, images.size());
   EXPECT_TRUE(images[0].Size() == WebSize(2, 2));
   EXPECT_TRUE(images[1].Size() == WebSize(1, 1));
-  SkAutoLockPixels auto_lock1(images[0].GetSkBitmap());
   EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255),
             images[0].GetSkBitmap().getColor(0, 0));
-  SkAutoLockPixels auto_lock2(images[1].GetSkBitmap());
   EXPECT_EQ(SkColorSetARGB(255, 0, 0, 0),
             images[1].GetSkBitmap().getColor(0, 0));
 }
 
 TEST(WebImageTest, ICOValidHeaderMissingBitmap) {
   RefPtr<SharedBuffer> data = ReadFile("valid_header_missing_bitmap.ico");
   ASSERT_TRUE(data.Get());
 
   WebVector<WebImage> images = WebImage::FramesFromData(WebData(data));
   ASSERT_TRUE(images.IsEmpty());
 }
 
 TEST(WebImageTest, BadImage) {
   const char kBadImage[] = "hello world";
   WebVector<WebImage> images = WebImage::FramesFromData(WebData(kBadImage));
   ASSERT_EQ(0u, images.size());
 
   WebImage image = WebImage::FromData(WebData(kBadImage), WebSize());
   EXPECT_TRUE(image.GetSkBitmap().empty());
   EXPECT_TRUE(image.GetSkBitmap().isNull());
 }
 
 }  // namespace blink