SkBitmap and SkPixelRef no longer need lock/unlock

cc/resources/ui_resource_bitmap.h

 // Copyright 2013 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.
 
 #ifndef CC_RESOURCES_UI_RESOURCE_BITMAP_H_
 #define CC_RESOURCES_UI_RESOURCE_BITMAP_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 36 matching lines @@
   UIResourceBitmap(const gfx::Size& size, bool is_opaque);
   UIResourceBitmap(sk_sp<SkPixelRef> pixel_ref, const gfx::Size& size);
   UIResourceBitmap(const UIResourceBitmap& other);
   ~UIResourceBitmap();
 
   // Returns the memory usage of the bitmap.
   size_t EstimateMemoryUsage() const {
     return pixel_ref_ ? pixel_ref_->rowBytes() * size_.height() : 0;
   }
 
+  const uint8_t* GetPixels() const {
+    return pixel_ref_ ? static_cast<const uint8_t*>(pixel_ref_->pixels())

[f(malita), 2017/04/17 19:31:36]

nit: prev version assumes pixel_ref_ is non-null; maybe DCHECK_NE to document
instead of explicit check?

[reed1, 2017/04/17 20:18:40]

removed check.

+                      : nullptr;
+  }
+
  private:
   friend class AutoLockUIResourceBitmap;
 
   void Create(sk_sp<SkPixelRef> pixel_ref,
               const gfx::Size& size,
               UIResourceFormat format);
 
   sk_sp<SkPixelRef> pixel_ref_;
   UIResourceFormat format_;
   gfx::Size size_;
   bool opaque_;
 };
 
-class CC_EXPORT AutoLockUIResourceBitmap {
- public:
-  explicit AutoLockUIResourceBitmap(const UIResourceBitmap& bitmap);
-  ~AutoLockUIResourceBitmap();
-  const uint8_t* GetPixels() const;
-
- private:
-  const UIResourceBitmap& bitmap_;
-};
-
 }  // namespace cc
 
 #endif  // CC_RESOURCES_UI_RESOURCE_BITMAP_H_