diff options
| -rw-r--r-- | src/core/SkBitmapProvider.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/SkBitmapProvider.h b/src/core/SkBitmapProvider.h index 9901c0fc1a..2080104b87 100644 --- a/src/core/SkBitmapProvider.h +++ b/src/core/SkBitmapProvider.h @@ -15,10 +15,10 @@ class SkBitmapProvider { public: explicit SkBitmapProvider(const SkBitmap& bm) : fBitmap(bm) {} - explicit SkBitmapProvider(const SkImage* img) : fImage(SkSafeRef(img)) {} + explicit SkBitmapProvider(const SkImage* img) : fImage(img) {} SkBitmapProvider(const SkBitmapProvider& other) : fBitmap(other.fBitmap) - , fImage(SkSafeRef(other.fImage.get())) + , fImage(other.fImage) {} int width() const; @@ -38,8 +38,14 @@ public: bool asBitmap(SkBitmap*) const; private: - SkBitmap fBitmap; - SkAutoTUnref<const SkImage> fImage; + // Stack-allocated only. + void* operator new(size_t) = delete; + void* operator new(size_t, void*) = delete; + + SkBitmap fBitmap; + // SkBitmapProvider is always short-lived/stack allocated, and the source image is guaranteed + // to outlive its scope => we can store a raw ptr to avoid ref churn. + const SkImage* fImage; }; #endif |