SkBitmap and SkPixelRef no longer need lock/unlock

ui/views/controls/image_view.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/views/controls/image_view.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "cc/paint/paint_flags.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
 
 namespace views {
 
 namespace {
 
 // Returns the pixels for the bitmap in |image| at scale |image_scale|.
 void* GetBitmapPixels(const gfx::ImageSkia& img, float image_scale) {
   DCHECK_NE(0.0f, image_scale);
-  const SkBitmap& bitmap = img.GetRepresentation(image_scale).sk_bitmap();
-  SkAutoLockPixels pixel_lock(bitmap);
-  return bitmap.getPixels();
+  return img.GetRepresentation(image_scale).sk_bitmap().getPixels();
 }
 
 }  // namespace
 
 // static
 const char ImageView::kViewClassName[] = "ImageView";
 
 ImageView::ImageView()
     : image_size_set_(false),
       horiz_alignment_(CENTER),
@@ skipping 165 matching lines @@
                          image_bounds.x(), image_bounds.y(),
                          image_bounds.width(), image_bounds.height(), true,
                          flags);
   } else {
     canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y());
   }
   last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_);
 }
 
 }  // namespace views