| Index: src/utils/SkWhitelistTypefaces.cpp
|
| diff --git a/src/utils/SkWhitelistTypefaces.cpp b/src/utils/SkWhitelistTypefaces.cpp
|
| index 007def6d8be7f55836db5c581d6e5215a6ee5902..139e697ca08f4dd0eb540329ab446829dd3cbe64 100644
|
| --- a/src/utils/SkWhitelistTypefaces.cpp
|
| +++ b/src/utils/SkWhitelistTypefaces.cpp
|
| @@ -63,7 +63,7 @@
|
| }
|
|
|
| static uint32_t compute_checksum(const SkTypeface* tf) {
|
| - std::unique_ptr<SkFontData> fontData = tf->makeFontData();
|
| + SkFontData* fontData = tf->createFontData();
|
| if (!fontData) {
|
| return 0;
|
| }
|
| @@ -118,7 +118,7 @@
|
|
|
| // Embed font data if it's a local font.
|
| if (isLocal && !desc.hasFontData()) {
|
| - desc.setFontData(tf->makeFontData());
|
| + desc.setFontData(tf->createFontData());
|
| }
|
| desc.serialize(wstream);
|
| }
|
| @@ -190,9 +190,9 @@
|
| return nullptr;
|
| }
|
|
|
| - std::unique_ptr<SkFontData> data = desc.detachFontData();
|
| + SkFontData* data = desc.detachFontData();
|
| if (data) {
|
| - sk_sp<SkTypeface> typeface(SkTypeface::MakeFromFontData(std::move(data)));
|
| + sk_sp<SkTypeface> typeface(SkTypeface::MakeFromFontData(data));
|
| if (typeface) {
|
| return typeface;
|
| }
|
|
|