| Index: src/core/SkTypeface.cpp
|
| diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
|
| index e6a9b4d66cd0f71988cb24e8eb840022ca9316d3..55d8f0e5a099377e1020e7a042b0df4b68bbc3fa 100644
|
| --- a/src/core/SkTypeface.cpp
|
| +++ b/src/core/SkTypeface.cpp
|
| @@ -180,7 +180,13 @@ SkTypeface* SkTypeface::Deserialize(SkStream* stream) {
|
| if (gDeserializeTypefaceDelegate) {
|
| return (*gDeserializeTypefaceDelegate)(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);
|
|
|