SkBitmap and SkPixelRef no longer need lock/unlock

content/test/image_decoder_test.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 "content/test/image_decoder_test.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 43 matching lines @@
 base::FilePath GetMD5SumPath(const base::FilePath& path) {
   static const base::FilePath::StringType kDecodedDataExtension(
       FILE_PATH_LITERAL(".md5sum"));
   return base::FilePath(path.value() + kDecodedDataExtension);
 }
 
 #if defined(CALCULATE_MD5_SUMS)
 void SaveMD5Sum(const base::FilePath& path, const blink::WebImage& web_image) {
   // Calculate MD5 sum.
   base::MD5Digest digest;
-  web_image.getSkBitmap().lockPixels();
   base::MD5Sum(web_image.getSkBitmap().getPixels(),
                web_image.getSkBitmap().width() *
                    web_image.getSkBitmap().height() * sizeof(uint32_t),
                &digest);
 
   // Write sum to disk.
   int bytes_written = base::WriteFile(
       path, reinterpret_cast<const char*>(&digest), sizeof digest);
   ASSERT_EQ(sizeof digest, bytes_written);
-  web_image.getSkBitmap().unlockPixels();
 }
 #endif
 
 #if !defined(CALCULATE_MD5_SUMS)
 void VerifyImage(const blink::WebImageDecoder& decoder,
                  const base::FilePath& path,
                  const base::FilePath& md5_sum_path,
                  size_t frame_index) {
   // Make sure decoding can complete successfully.
   EXPECT_TRUE(decoder.IsSizeAvailable()) << path.value();
   EXPECT_GE(decoder.FrameCount(), frame_index) << path.value();
   EXPECT_TRUE(decoder.IsFrameCompleteAtIndex(frame_index)) << path.value();
   EXPECT_FALSE(decoder.IsFailed());
 
   // Calculate MD5 sum.
   base::MD5Digest actual_digest;
   blink::WebImage web_image = decoder.GetFrameAtIndex(frame_index);
-  web_image.GetSkBitmap().lockPixels();
   base::MD5Sum(web_image.GetSkBitmap().getPixels(),
                web_image.GetSkBitmap().width() *
                    web_image.GetSkBitmap().height() * sizeof(uint32_t),
                &actual_digest);
 
   // Read the MD5 sum off disk.
   std::string file_bytes;
   base::ReadFileToString(md5_sum_path, &file_bytes);
   base::MD5Digest expected_digest;
   ASSERT_EQ(sizeof expected_digest, file_bytes.size()) << path.value();
   memcpy(&expected_digest, file_bytes.data(), sizeof expected_digest);
 
   // Verify that the sums are the same.
   EXPECT_EQ(0, memcmp(&expected_digest, &actual_digest, sizeof actual_digest))
       << path.value();
-  web_image.GetSkBitmap().unlockPixels();
 }
 #endif
 
 void ImageDecoderTest::SetUp() {
   base::FilePath data_dir;
   ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir));
   data_dir_ = data_dir.AppendASCII("webkit").AppendASCII("data").AppendASCII(
       format_ + "_decoder");
   if (!base::PathExists(data_dir_)) {
     const testing::TestInfo* const test_info =
@@ skipping 87 matching lines @@
     EXPECT_TRUE(decoder->IsFailed());
   } else {
     EXPECT_FALSE(decoder->IsFailed()) << image_path.value();
 #if defined(CALCULATE_MD5_SUMS)
     SaveMD5Sum(md5_sum_path, decoder->getFrameAtIndex(desired_frame_index));
 #else
     VerifyImage(*decoder, image_path, md5_sum_path, desired_frame_index);
 #endif
   }
 }