SkBitmap and SkPixelRef no longer need lock/unlock

ui/gfx/skia_util.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 "ui/gfx/skia_util.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/numerics/safe_conversions.h"
@@ skipping 79 matching lines @@
   flattened->set(7, SkMScalarToScalar(transform.matrix().get(3, 1)));
   flattened->set(8, SkMScalarToScalar(transform.matrix().get(3, 3)));
 }
 
 bool BitmapsAreEqual(const SkBitmap& bitmap1, const SkBitmap& bitmap2) {
   void* addr1 = NULL;
   void* addr2 = NULL;
   size_t size1 = 0;
   size_t size2 = 0;
 
-  bitmap1.lockPixels();
   addr1 = bitmap1.getAddr32(0, 0);
   size1 = bitmap1.getSize();
-  bitmap1.unlockPixels();
 
-  bitmap2.lockPixels();
   addr2 = bitmap2.getAddr32(0, 0);
   size2 = bitmap2.getSize();
-  bitmap2.unlockPixels();
 
   return (size1 == size2) && (0 == memcmp(addr1, addr2, bitmap1.getSize()));
 }
 
 void ConvertSkiaToRGBA(const unsigned char* skia,
                        int pixel_width,
                        unsigned char* rgba) {
   int total_length = pixel_width * 4;
   for (int i = 0; i < total_length; i += 4) {
     const uint32_t pixel_in = *reinterpret_cast<const uint32_t*>(&skia[i]);
@@ skipping 33 matching lines @@
   static const SkScalar kSkToHbRatio = SK_Scalar1 / kHbUnit1;
   return kSkToHbRatio * value;
 }
 
 float HarfBuzzUnitsToFloat(int value) {
   static const float kFloatToHbRatio = 1.0f / kHbUnit1;
   return kFloatToHbRatio * value;
 }
 
 }  // namespace gfx