| Index: cc/resources/ui_resource_bitmap.h
|
| diff --git a/cc/resources/ui_resource_bitmap.h b/cc/resources/ui_resource_bitmap.h
|
| index dadbdee08c279465b452a7d27d54e9efd8ef4758..c56cc86115e9a25f84b72de065d7ebffc8831238 100644
|
| --- a/cc/resources/ui_resource_bitmap.h
|
| +++ b/cc/resources/ui_resource_bitmap.h
|
| @@ -11,7 +11,6 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "cc/base/cc_export.h"
|
| -#include "skia/ext/refptr.h"
|
| #include "third_party/skia/include/core/SkPixelRef.h"
|
| #include "ui/gfx/geometry/size.h"
|
|
|
| @@ -42,19 +41,18 @@ class CC_EXPORT UIResourceBitmap {
|
| // be 32-bit RGBA or 8-bit ALPHA.
|
| explicit UIResourceBitmap(const SkBitmap& skbitmap);
|
| UIResourceBitmap(const gfx::Size& size, bool is_opaque);
|
| - UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref,
|
| - const gfx::Size& size);
|
| + UIResourceBitmap(sk_sp<SkPixelRef> pixel_ref, const gfx::Size& size);
|
| UIResourceBitmap(const UIResourceBitmap& other);
|
| ~UIResourceBitmap();
|
|
|
| private:
|
| friend class AutoLockUIResourceBitmap;
|
|
|
| - void Create(const skia::RefPtr<SkPixelRef>& pixel_ref,
|
| + void Create(sk_sp<SkPixelRef> pixel_ref,
|
| const gfx::Size& size,
|
| UIResourceFormat format);
|
|
|
| - skia::RefPtr<SkPixelRef> pixel_ref_;
|
| + sk_sp<SkPixelRef> pixel_ref_;
|
| UIResourceFormat format_;
|
| gfx::Size size_;
|
| bool opaque_;
|
|
|