diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-26 12:29:05 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-26 12:29:05 +0000 |
| commit | 1fa793fa6b83219a266124aa70455540b98a4633 (patch) | |
| tree | dd26f57cfb41dee4002d420731ee369e5f7397e4 /src/core/SkScalerContext.cpp | |
| parent | 02c77648ce7b7a8016842603ad0892e0095a6bd6 (diff) | |
remove SkFontHost::NextLogicalFont, and add android-specific function
SkAndroidNextLogicalTypeface
git-svn-id: http://skia.googlecode.com/svn/trunk@8386 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkScalerContext.cpp')
| -rw-r--r-- | src/core/SkScalerContext.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp index 98b5a7a43f..c02dbca93b 100644 --- a/src/core/SkScalerContext.cpp +++ b/src/core/SkScalerContext.cpp @@ -22,6 +22,9 @@ #include "SkStroke.h" #include "SkThread.h" +#ifdef SK_BUILD_FOR_ANDROID + #include "SkTypeface_android.h" +#endif #define ComputeBWRowBytes(width) (((unsigned)(width) + 7) >> 3) @@ -121,8 +124,8 @@ SkScalerContext::~SkScalerContext() { // there are no more entries in the fallback chain. SkScalerContext* SkScalerContext::allocNextContext() const { #ifdef SK_BUILD_FOR_ANDROID - SkTypeface* newFace = SkFontHost::NextLogicalTypeface(fRec.fFontID, - fRec.fOrigFontID); + SkTypeface* newFace = SkAndroidNextLogicalTypeface(fRec.fFontID, + fRec.fOrigFontID); if (0 == newFace) { return NULL; } |