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

Unified Diff: cc/playback/discardable_image_map.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/playback/discardable_image_map.h
diff --git a/cc/playback/discardable_image_map.h b/cc/playback/discardable_image_map.h
index 3b29da20b4260aa0eafeb04aef9fdb50f739f6ed..34316309fd7b42975f43db4ce64c7086d252e6a5 100644
--- a/cc/playback/discardable_image_map.h
+++ b/cc/playback/discardable_image_map.h
@@ -11,7 +11,6 @@
#include "cc/base/cc_export.h"
#include "cc/base/rtree.h"
#include "cc/playback/draw_image.h"
-#include "skia/ext/refptr.h"
danakj 2016/04/14 19:37:32 we should technically be including SkRefCnt.h in e
tomhudson 2016/04/25 20:48:13 Done.
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPicture.h"
#include "ui/gfx/geometry/rect.h"
@@ -39,7 +38,7 @@ class CC_EXPORT DiscardableImageMap {
private:
DiscardableImageMap* image_map_;
- skia::RefPtr<SkCanvas> metadata_canvas_;
+ sk_sp<SkCanvas> metadata_canvas_;
};
DiscardableImageMap();
@@ -54,7 +53,7 @@ class CC_EXPORT DiscardableImageMap {
friend class ScopedMetadataGenerator;
friend class DiscardableImageMapTest;
- skia::RefPtr<SkCanvas> BeginGeneratingMetadata(const gfx::Size& bounds);
+ sk_sp<SkCanvas> BeginGeneratingMetadata(const gfx::Size& bounds);
void EndGeneratingMetadata();
std::vector<std::pair<DrawImage, gfx::Rect>> all_images_;

Powered by Google App Engine
This is Rietveld 408576698