diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-31 15:48:10 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-31 15:48:10 +0000 |
| commit | 29bf8625152c240311f851a8a0df3e543ed824c9 (patch) | |
| tree | 8cc84a8a06fd05323609bd274916afbb3e368ce1 /src/ports | |
| parent | 631a59b9393208ed3546e81ca843f2f7da06ca64 (diff) | |
Upstream changes from Android
R=scroggo@google.com
Review URL: https://codereview.chromium.org/21053009
git-svn-id: http://skia.googlecode.com/svn/trunk@10461 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports')
| -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 738b11434e..e9886188b2 100644 --- a/src/ports/SkFontConfigInterface_android.cpp +++ b/src/ports/SkFontConfigInterface_android.cpp @@ -593,7 +593,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 && currFontID != origFontID) { currFontRecID = ((FontConfigTypeface*)currTypeface)->getIdentity().fID; SkASSERT(INVALID_FONT_REC_ID != currFontRecID); } |