diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-23 17:21:28 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-23 17:21:28 +0000 |
| commit | 94da31dd3b1b240f649cde30b767247681b7724b (patch) | |
| tree | 2b074f58a1c21238c2aa6bcc7a0ac7848a45e243 | |
| parent | 6dda827913a3dbdb84934f4f1d79c0b702169e5c (diff) | |
Upstream Android Changes from K release
R=scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/145233002
git-svn-id: http://skia.googlecode.com/svn/trunk@13152 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/ports/SkFontConfigInterface_android.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp index c2ea87ecca..14be93457f 100644 --- a/src/ports/SkFontConfigInterface_android.cpp +++ b/src/ports/SkFontConfigInterface_android.cpp @@ -633,7 +633,7 @@ SkTypeface* SkFontConfigInterfaceAndroid::nextLogicalTypeface(SkFontID currFontI const SkTypeface* currTypeface = SkTypefaceCache::FindByID(currFontID); // non-system fonts are not in the font cache so if we are asked to fallback // for a non-system font we will start at the front of the chain. - if (NULL != currTypeface && currFontID != origFontID) { + if (NULL != currTypeface) { currFontRecID = ((FontConfigTypeface*)currTypeface)->getIdentity().fID; SkASSERT(INVALID_FONT_REC_ID != currFontRecID); } |