SkBitmap and SkPixelRef no longer need lock/unlock

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 7465 matching lines @@
   FrameTestHelpers::LoadHTMLString(frame, kBluePNG, test_url);
 
   WebNode node = frame->GetDocument().Body().FirstChild();
   EXPECT_TRUE(node.IsElementNode());
   WebElement element = node.To<WebElement>();
   WebImage image = element.ImageContents();
   ASSERT_FALSE(image.IsNull());
   EXPECT_EQ(image.Size().width, 10);
   EXPECT_EQ(image.Size().height, 10);
   SkBitmap bitmap = image.GetSkBitmap();
-  SkAutoLockPixels locker(bitmap);
   EXPECT_EQ(bitmap.getColor(0, 0), SK_ColorBLUE);
 }
 
 class TestStartStopCallbackWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   TestStartStopCallbackWebFrameClient()
       : start_loading_count_(0),
         stop_loading_count_(0),
         different_document_start_count_(0) {}
@@ skipping 1080 matching lines @@
   // Prepare the reference bitmap.
   SkBitmap bitmap;
   bitmap.allocN32Pixels(reference_bitmap_size.Width(),
                         reference_bitmap_size.Height());
   SkCanvas canvas(bitmap);
   canvas.drawColor(SK_ColorGREEN);
 
   EXPECT_EQ(reference_bitmap_size.Width(), drag_image->Size().Width());
   EXPECT_EQ(reference_bitmap_size.Height(), drag_image->Size().Height());
   const SkBitmap& drag_bitmap = drag_image->Bitmap();
-  SkAutoLockPixels lock_pixel(drag_bitmap);
   EXPECT_EQ(
       0, memcmp(bitmap.getPixels(), drag_bitmap.getPixels(), bitmap.getSize()));
 }
 
 TEST_P(ParameterizedWebFrameTest, NodeImageTestCSSTransformDescendant) {
   FrameTestHelpers::WebViewHelper web_view_helper;
   std::unique_ptr<DragImage> drag_image = NodeImageTestSetup(
       &web_view_helper, std::string("case-css-3dtransform-descendant"));
   EXPECT_TRUE(drag_image);
 
@@ skipping 2021 matching lines @@
   WebLocalFrame* local_frame = web_view->MainFrameImpl();
   local_frame->CopyImageAt(WebPoint(50, 50));
 
   EXPECT_NE(sequence, Platform::Current()->Clipboard()->SequenceNumber(
                           WebClipboard::kBufferStandard));
 
   WebImage image =
       static_cast<WebMockClipboard*>(Platform::Current()->Clipboard())
           ->ReadRawImage(WebClipboard::Buffer());
 
-  SkAutoLockPixels auto_lock(image.GetSkBitmap());
   EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.GetSkBitmap().getColor(0, 0));
 };
 
 TEST_F(WebFrameTest, CopyImageAtWithPinchZoom) {
   std::string url = base_url_ + "canvas-copy-image.html";
   RegisterMockedURLLoadFromBase(base_url_, "canvas-copy-image.html");
 
   FrameTestHelpers::WebViewHelper helper;
   WebViewImpl* web_view = helper.InitializeAndLoad(url, true, 0);
   web_view->Resize(WebSize(400, 400));
   web_view->UpdateAllLifecyclePhases();
   web_view->SetPageScaleFactor(2);
   web_view->SetVisualViewportOffset(WebFloatPoint(200, 200));
 
   uint64_t sequence = Platform::Current()->Clipboard()->SequenceNumber(
       WebClipboard::kBufferStandard);
 
   WebLocalFrame* local_frame = web_view->MainFrameImpl();
   local_frame->CopyImageAt(WebPoint(0, 0));
 
   EXPECT_NE(sequence, Platform::Current()->Clipboard()->SequenceNumber(
                           WebClipboard::kBufferStandard));
 
   WebImage image =
       static_cast<WebMockClipboard*>(Platform::Current()->Clipboard())
           ->ReadRawImage(WebClipboard::Buffer());
 
-  SkAutoLockPixels auto_lock(image.GetSkBitmap());
   EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.GetSkBitmap().getColor(0, 0));
 };
 
 TEST_F(WebFrameTest, CopyImageWithImageMap) {
   SaveImageFromDataURLWebFrameClient client;
 
   std::string url = base_url_ + "image-map.html";
   RegisterMockedURLLoadFromBase(base_url_, "image-map.html");
 
   FrameTestHelpers::WebViewHelper helper;
@@ skipping 1333 matching lines @@
 
   // Failing the original child frame navigation and trying to render fallback
   // content shouldn't crash. It should return NoLoadInProgress. This is so the
   // caller won't attempt to replace the correctly empty frame with an error
   // page.
   EXPECT_EQ(WebLocalFrame::NoLoadInProgress,
             child->MaybeRenderFallbackContent(WebURLError()));
 }
 
 }  // namespace blink