| Index: src/fonts/SkRandomScalerContext.cpp
|
| diff --git a/src/fonts/SkRandomScalerContext.cpp b/src/fonts/SkRandomScalerContext.cpp
|
| index 245052053e3d40f77413913d4bf7ff7d60e93908..6d3718cbef0ef73085e750a0d11c3b837470430e 100644
|
| --- a/src/fonts/SkRandomScalerContext.cpp
|
| +++ b/src/fonts/SkRandomScalerContext.cpp
|
| @@ -190,16 +190,12 @@ void SkRandomScalerContext::generateFontMetrics(SkPaint::FontMetrics* metrics) {
|
|
|
| #include "SkTypefaceCache.h"
|
|
|
| -SkRandomTypeface::SkRandomTypeface(SkTypeface* proxy, const SkPaint& paint, bool fakeIt)
|
| +SkRandomTypeface::SkRandomTypeface(sk_sp<SkTypeface> proxy, const SkPaint& paint, bool fakeIt)
|
| : SkTypeface(proxy->fontStyle(), SkTypefaceCache::NewFontID(), false)
|
| - , fProxy(SkRef(proxy))
|
| + , fProxy(std::move(proxy))
|
| , fPaint(paint)
|
| , fFakeIt(fakeIt) {}
|
|
|
| -SkRandomTypeface::~SkRandomTypeface() {
|
| - fProxy->unref();
|
| -}
|
| -
|
| SkScalerContext* SkRandomTypeface::onCreateScalerContext(const SkScalerContextEffects& effects,
|
| const SkDescriptor* desc) const {
|
| return new SkRandomScalerContext(const_cast<SkRandomTypeface*>(this), effects, desc, fFakeIt);
|
|
|