SkBitmap and SkPixelRef no longer need lock/unlock

skia/public/interfaces/bitmap_skbitmap_struct_traits.cc

 // Copyright 2016 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 "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
 
 namespace mojo {
 
 namespace {
 
@@ skipping 162 matching lines @@
                             MojoAlphaTypeToSk(data.alpha_type()),
                             MojoProfileTypeToSk(data.profile_type())),
           data.row_bytes())) {
     return false;
   }
 
   // If the image is empty, return success after setting the image info.
   if (data.width() == 0 || data.height() == 0)
     return true;
 
-  SkAutoPixmapUnlock pixmap;
   mojo::ArrayDataView<uint8_t> data_view;
   data.GetPixelDataDataView(&data_view);
   if (static_cast<uint32_t>(b->width()) != data.width() ||
       static_cast<uint32_t>(b->height()) != data.height() ||
       static_cast<uint64_t>(b->rowBytes()) != data.row_bytes() ||
-      b->getSize() != data_view.size() || !b->requestLock(&pixmap) ||
-      !b->readyToDraw()) {
+      b->getSize() != data_view.size() || !b->readyToDraw()) {
     return false;
   }
 
   BitmapBuffer bitmap_buffer = {0, b->getSize(),
                                 static_cast<uint8_t*>(b->getPixels())};
   if (!data.ReadPixelData(&bitmap_buffer) || bitmap_buffer.size != b->getSize())
     return false;
 
   b->notifyPixelsChanged();
   return true;
 }
 
 // static
 void* StructTraits<skia::mojom::BitmapDataView, SkBitmap>::SetUpContext(

[dcheng, 2017/04/17 22:03:10]

Nit: please remove these members, since they're no longer needed.

[reed1, 2017/04/18 12:53:01]

Done.

     const SkBitmap& b) {
-  b.lockPixels();
   return nullptr;
 }
 
 // static
 void StructTraits<skia::mojom::BitmapDataView, SkBitmap>::TearDownContext(
     const SkBitmap& b,
     void* context) {
-  b.unlockPixels();
 }
 
 }  // namespace mojo