SkBitmap and SkPixelRef no longer need lock/unlock

third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.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 68 matching lines @@
       : info_(info), pixels_(pixels), row_bytes_(row_bytes) {}
 
   bool allocPixelRef(SkBitmap* dst, SkColorTable* ctable) override {
     const SkImageInfo& info = dst->info();
     if (kUnknown_SkColorType == info.colorType())
       return false;
 
     if (!CompatibleInfo(info_, info) || row_bytes_ != dst->rowBytes())
       return false;
 
-    if (!dst->installPixels(info, pixels_, row_bytes_))
-      return false;
-    dst->lockPixels();
-    return true;
+    return dst->installPixels(info, pixels_, row_bytes_);
   }
 
  private:
   SkImageInfo info_;
   void* pixels_;
   size_t row_bytes_;
 };
 
 static bool UpdateYUVComponentSizes(ImageDecoder* decoder,
                                     SkISize component_sizes[3],
@@ skipping 55 matching lines @@
                         &external_allocator, alpha_option);
   DCHECK(external_allocator.unique());  // Verify we have the only ref-count.
 
   if (bitmap.isNull())
     return false;
 
   // Check to see if the decoder has written directly to the pixel memory
   // provided. If not, make a copy.
   DCHECK_EQ(bitmap.width(), scaled_size.width());
   DCHECK_EQ(bitmap.height(), scaled_size.height());
-  SkAutoLockPixels bitmap_lock(bitmap);
   if (bitmap.getPixels() != pixels)
     CopyPixels(pixels, row_bytes, bitmap.getPixels(), bitmap.rowBytes(), info);
   return true;
 }
 
 bool ImageFrameGenerator::DecodeToYUV(SegmentReader* data,
                                       size_t index,
                                       const SkISize component_sizes[3],
                                       void* planes[3],
                                       const size_t row_bytes[3]) {
@@ skipping 222 matching lines @@
   // do YUV decoding.
   std::unique_ptr<ImagePlanes> dummy_image_planes =
       WTF::WrapUnique(new ImagePlanes);
   decoder->SetImagePlanes(std::move(dummy_image_planes));
 
   return UpdateYUVComponentSizes(decoder.get(), size_info->fSizes,
                                  size_info->fWidthBytes);
 }
 
 }  // namespace blink