| Index: src/ports/SkFontMgr_fontconfig.cpp
|
| diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
|
| index b8a3fe5b0d232de1c0c21c74c6613c1965445e25..f4cae23e03fce5498207009b6af9e4f536d99eaf 100644
|
| --- a/src/ports/SkFontMgr_fontconfig.cpp
|
| +++ b/src/ports/SkFontMgr_fontconfig.cpp
|
| @@ -389,6 +389,10 @@ public:
|
| , fIndex(ttcIndex)
|
| { };
|
|
|
| + virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE {
|
| + familyName->reset();
|
| + }
|
| +
|
| virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const SK_OVERRIDE {
|
| desc->setStyle(this->style());
|
| *serialize = true;
|
| @@ -414,6 +418,10 @@ public:
|
| }
|
| mutable SkAutoFcPattern fPattern;
|
|
|
| + virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE {
|
| + *familyName = get_string(fPattern, FC_FAMILY);
|
| + }
|
| +
|
| virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const SK_OVERRIDE {
|
| FCLocker lock;
|
| desc->setFamilyName(get_string(fPattern, FC_FAMILY));
|
|
|