Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(605)

Unified Diff: cc/resources/ui_resource_bitmap.h

Issue 1869753003: Replace many skia::RefPtr with sk_sp<> in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..7be58d909dc82b4509814b88e06c7852fd51ff52 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(const sk_sp<SkPixelRef>& pixel_ref, const gfx::Size& size);
danakj 2016/04/14 19:37:32 pass by value
tomhudson 2016/04/25 20:48:14 Done.
UIResourceBitmap(const UIResourceBitmap& other);
~UIResourceBitmap();
private:
friend class AutoLockUIResourceBitmap;
- void Create(const skia::RefPtr<SkPixelRef>& pixel_ref,
+ void Create(const sk_sp<SkPixelRef>& pixel_ref,
danakj 2016/04/14 19:37:32 pass by value
tomhudson 2016/04/25 20:48:13 Done.
const gfx::Size& size,
UIResourceFormat format);
- skia::RefPtr<SkPixelRef> pixel_ref_;
+ sk_sp<SkPixelRef> pixel_ref_;
UIResourceFormat format_;
gfx::Size size_;
bool opaque_;

Powered by Google App Engine
This is Rietveld 408576698