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

Unified Diff: third_party/WebKit/Source/platform/graphics/StaticBitmapImage.h

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)
Patch Set: Rebasing... Created 4 years, 3 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: third_party/WebKit/Source/platform/graphics/StaticBitmapImage.h
diff --git a/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.h b/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.h
index 21caac78ae27094dd64736795bb1e8dc6d519fdd..398aeadfb3178b704185f07e0b054998f17793fb 100644
--- a/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.h
+++ b/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.h
@@ -7,6 +7,7 @@
#include "platform/graphics/Image.h"
#include "third_party/khronos/GLES2/gl2.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
namespace blink {
@@ -18,13 +19,13 @@ public:
bool currentFrameIsComplete() override { return true; }
- static PassRefPtr<StaticBitmapImage> create(PassRefPtr<SkImage>);
+ static PassRefPtr<StaticBitmapImage> create(sk_sp<SkImage>);
void destroyDecodedData() override { }
bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override;
IntSize size() const override;
void draw(SkCanvas*, const SkPaint&, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum, ImageClampingMode) override;
- PassRefPtr<SkImage> imageForCurrentFrame() override;
+ sk_sp<SkImage> imageForCurrentFrame() override;
bool originClean() const { return m_isOriginClean; }
void setOriginClean(bool flag) { m_isOriginClean = flag; }
@@ -35,9 +36,9 @@ public:
virtual bool hasMailbox() { return false; }
protected:
- StaticBitmapImage(PassRefPtr<SkImage>);
+ StaticBitmapImage(sk_sp<SkImage>);
StaticBitmapImage() { } // empty constructor for derived class.
- RefPtr<SkImage> m_image;
+ sk_sp<SkImage> m_image;
private:
bool m_isOriginClean = true;

Powered by Google App Engine
This is Rietveld 408576698