diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-25 16:36:34 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-25 16:36:34 +0000 |
| commit | d257a7e5fddd55e226b3bd3e7307f107236884b8 (patch) | |
| tree | ec8e2cd8383d868b4e8e1f67221848e35a967287 | |
| parent | 71ebd0595b4d91f22bb975b0c78d2d4e3089823b (diff) | |
limit SkFontHost::NextLogicalTypeface to only android (the only backend that
seems to rely on it), so we can remove it from the portable API.
git-svn-id: http://skia.googlecode.com/svn/trunk@8366 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkScalerContext.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp index 437dc151aa..98b5a7a43f 100644 --- a/src/core/SkScalerContext.cpp +++ b/src/core/SkScalerContext.cpp @@ -120,6 +120,7 @@ SkScalerContext::~SkScalerContext() { // Return the context associated with the next logical typeface, or NULL if // 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); if (0 == newFace) { @@ -140,6 +141,9 @@ SkScalerContext* SkScalerContext::allocNextContext() const { desc->computeChecksum(); return newFace->createScalerContext(desc); +#else + return NULL; +#endif } /* Return the next context, creating it if its not already created, but return |