| Index: src/utils/SkWhitelistTypefaces.cpp
|
| diff --git a/src/utils/SkWhitelistTypefaces.cpp b/src/utils/SkWhitelistTypefaces.cpp
|
| index d3ffe98d16c052f95630ae0058512637008cdb9d..a6c6dc5a5a8ced90e7c40420a742618e08698d61 100644
|
| --- a/src/utils/SkWhitelistTypefaces.cpp
|
| +++ b/src/utils/SkWhitelistTypefaces.cpp
|
| @@ -184,7 +184,13 @@ void WhitelistSerializeTypeface(const SkTypeface* tf, SkWStream* wstream) {
|
| }
|
|
|
| SkTypeface* WhitelistDeserializeTypeface(SkStream* stream) {
|
| - SkFontDescriptor desc(stream);
|
| + SkFontDescriptor desc;
|
| +
|
| + if (!SkFontDescriptor::Deserialize(stream, &desc)) {
|
| + SkDEBUGFAIL("Font Descriptor deserialization failed\n")
|
| + return nullptr;
|
| + }
|
| +
|
| SkFontData* data = desc.detachFontData();
|
| if (data) {
|
| SkTypeface* typeface = SkTypeface::CreateFromFontData(data);
|
|
|