Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Unified Diff: src/ports/SkFontConfigInterface_android.cpp

Issue 15565008: Fix release build warnings for unused variables (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: use assert result Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698