| Index: src/fonts/SkGScalerContext.h
|
| diff --git a/src/fonts/SkGScalerContext.h b/src/fonts/SkGScalerContext.h
|
| index 69d02ddf114132197be16d1841459502d58c45b1..3eb25a81da1c3416d9438c39a119447801618147 100644
|
| --- a/src/fonts/SkGScalerContext.h
|
| +++ b/src/fonts/SkGScalerContext.h
|
| @@ -13,10 +13,9 @@
|
|
|
| class SkGTypeface : public SkTypeface {
|
| public:
|
| - SkGTypeface(SkTypeface* proxy, const SkPaint&);
|
| - virtual ~SkGTypeface();
|
| + SkGTypeface(sk_sp<SkTypeface> proxy, const SkPaint&);
|
|
|
| - SkTypeface* proxy() const { return fProxy; }
|
| + SkTypeface* proxy() const { return fProxy.get(); }
|
| const SkPaint& paint() const { return fPaint; }
|
|
|
| protected:
|
| @@ -43,8 +42,8 @@ protected:
|
| size_t length, void* data) const override;
|
|
|
| private:
|
| - SkTypeface* fProxy;
|
| - SkPaint fPaint;
|
| + sk_sp<SkTypeface> fProxy;
|
| + SkPaint fPaint;
|
| };
|
|
|
| #endif
|
|
|