SkBitmap and SkPixelRef no longer need lock/unlock

ui/gfx/image/image_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/image/image_util.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 44 matching lines @@
 
 bool JPEG1xEncodedDataFromSkiaRepresentation(const Image& image,
                                              int quality,
                                              std::vector<unsigned char>* dst) {
   const gfx::ImageSkiaRep& image_skia_rep =
       image.AsImageSkia().GetRepresentation(1.0f);
   if (image_skia_rep.scale() != 1.0f)
     return false;
 
   const SkBitmap& bitmap = image_skia_rep.sk_bitmap();
-  SkAutoLockPixels bitmap_lock(bitmap);
-
   if (!bitmap.readyToDraw())
     return false;
 
   return gfx::JPEGCodec::Encode(
           reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)),
           gfx::JPEGCodec::FORMAT_SkBitmap, bitmap.width(),
           bitmap.height(),
           static_cast<int>(bitmap.rowBytes()), quality,
           dst);
 }
 #endif  // !defined(OS_IOS)
 
 void GetVisibleMargins(const ImageSkia& image, int* left, int* right) {
   *left = 0;
   *right = 0;
   if (!image.HasRepresentation(1.f))
     return;
   const SkBitmap& bitmap = image.GetRepresentation(1.f).sk_bitmap();
   if (bitmap.drawsNothing() || bitmap.isOpaque())
     return;
 
-  SkAutoLockPixels lock(bitmap);
   int x = 0;
   for (; x < bitmap.width(); ++x) {
     if (ColumnHasVisiblePixels(bitmap, x)) {
       *left = x;
       break;
     }
   }
 
   if (x == bitmap.width()) {
     // Image is fully transparent.  Divide the width in half, giving the leading
     // region the extra pixel for odd widths.
     *left = (bitmap.width() + 1) / 2;
     *right = bitmap.width() - *left;
     return;
   }
 
   // Since we already know column *left is non-transparent, we can avoid
   // rechecking that column; hence the '>' here.
   for (x = bitmap.width() - 1; x > *left; --x) {
     if (ColumnHasVisiblePixels(bitmap, x))
       break;
   }
   *right = bitmap.width() - 1 - x;
 }
 
 }  // namespace gfx