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

Unified Diff: cc/playback/draw_image.h

Issue 1900953004: Switch DrawImage to sk_sp<> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Florin's nit 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/draw_image.h
diff --git a/cc/playback/draw_image.h b/cc/playback/draw_image.h
index ac7a70ecdc6624a2428167053991858d6cf095f7..4daa16075debdfcb41330afbdc428bbcb8f9ea7b 100644
--- a/cc/playback/draw_image.h
+++ b/cc/playback/draw_image.h
@@ -9,6 +9,8 @@
#include "third_party/skia/include/core/SkFilterQuality.h"
#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
namespace cc {
@@ -17,13 +19,14 @@ namespace cc {
class CC_EXPORT DrawImage {
public:
DrawImage();
- DrawImage(const SkImage* image,
+ DrawImage(sk_sp<const SkImage> image,
const SkIRect& src_rect,
SkFilterQuality filter_quality,
const SkMatrix& matrix);
DrawImage(const DrawImage& other);
+ ~DrawImage();
- const SkImage* image() const { return image_; }
+ const sk_sp<const SkImage>& image() const { return image_; }
const SkSize& scale() const { return scale_; }
const SkIRect src_rect() const { return src_rect_; }
SkFilterQuality filter_quality() const { return filter_quality_; }
@@ -37,7 +40,7 @@ class CC_EXPORT DrawImage {
}
private:
- const SkImage* image_;
+ sk_sp<const SkImage> image_;
SkIRect src_rect_;
SkFilterQuality filter_quality_;
SkMatrix matrix_;

Powered by Google App Engine
This is Rietveld 408576698