| Index: src/fonts/SkFontMgr_indirect.cpp
|
| ===================================================================
|
| --- src/fonts/SkFontMgr_indirect.cpp (revision 13897)
|
| +++ src/fonts/SkFontMgr_indirect.cpp (working copy)
|
| @@ -155,12 +155,12 @@
|
| }
|
|
|
| int SkFontMgr_Indirect::onCountFamilies() const {
|
| - SkOnce(&fOnce, SkFontMgr_Indirect::set_up_family_names, this);
|
| + SkOnce(&fFamilyNamesInited, &fFamilyNamesMutex, SkFontMgr_Indirect::set_up_family_names, this);
|
| return fFamilyNames->count();
|
| }
|
|
|
| void SkFontMgr_Indirect::onGetFamilyName(int index, SkString* familyName) const {
|
| - SkOnce(&fOnce, SkFontMgr_Indirect::set_up_family_names, this);
|
| + SkOnce(&fFamilyNamesInited, &fFamilyNamesMutex, SkFontMgr_Indirect::set_up_family_names, this);
|
| if (index >= fFamilyNames->count()) {
|
| familyName->reset();
|
| return;
|
|
|