| Index: src/ports/SkFontConfigInterface_android.cpp
|
| diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp
|
| index 850d902ba4489b1d5afdd7c8ff8867890ec853ce..fee896ae0bdeeb5909ce280984647fac2e7af6ba 100644
|
| --- a/src/ports/SkFontConfigInterface_android.cpp
|
| +++ b/src/ports/SkFontConfigInterface_android.cpp
|
| @@ -412,8 +412,8 @@ bool SkFontConfigInterfaceAndroid::matchFamilyName(const char familyName[],
|
| } else {
|
| // find familyName from list of names
|
| const char* familyName = NULL;
|
| - bool found = fFamilyNameDict.findKey(familyRecID, &familyName);
|
| - SkASSERT(found && familyName);
|
| + SkAssertResult(fFamilyNameDict.findKey(familyRecID, &familyName));
|
| + SkASSERT(familyName);
|
| outFamilyName->set(familyName);
|
| }
|
| }
|
| @@ -542,13 +542,11 @@ SkTypeface* SkFontConfigInterfaceAndroid::nextLogicalTypeface(SkFontID currFontI
|
| return NULL;
|
| }
|
|
|
| - const SkTypeface* origTypeface = SkTypefaceCache::FindByID(origFontID);
|
| const SkTypeface* currTypeface = SkTypefaceCache::FindByID(currFontID);
|
|
|
| FallbackFontList* currentFallbackList = findFallbackFontList(opts.getLanguage());
|
| SkASSERT(currentFallbackList);
|
|
|
| - SkASSERT(origTypeface != 0);
|
| SkASSERT(currTypeface != 0);
|
|
|
| // we must convert currTypeface into a FontRecID
|
|
|