| Index: src/core/SkPaint.cpp
|
| diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
|
| index 25b6aec1ec46da9239a69aae39acfff5aee6e645..67bbda16652ca13e043aab6d2b1bc7336e8dbc2c 100644
|
| --- a/src/core/SkPaint.cpp
|
| +++ b/src/core/SkPaint.cpp
|
| @@ -369,9 +369,7 @@
|
| this->f##Field.reset(SkSafeRef(f)); \
|
| return f; \
|
| }
|
| -#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
|
| SET_PTR(Typeface)
|
| -#endif
|
| #ifdef SK_SUPPORT_LEGACY_MINOR_EFFECT_PTR
|
| SET_PTR(Rasterizer)
|
| #endif
|
| @@ -1898,7 +1896,7 @@
|
| this->setTextEncoding(static_cast<TextEncoding>((tmp >> 0) & 0xFF));
|
|
|
| if (flatFlags & kHasTypeface_FlatFlag) {
|
| - this->setTypeface(sk_ref_sp(buffer.readTypeface()));
|
| + this->setTypeface(buffer.readTypeface());
|
| } else {
|
| this->setTypeface(nullptr);
|
| }
|
|
|