diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-01 15:53:39 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-01 15:53:39 +0000 |
| commit | ab44a17f376039cdcaba74f9fb8f282ea4caa63c (patch) | |
| tree | c96ca59e5600a2fc029d467208ba5142daa13f2f | |
| parent | 62df526042f8a753c6817ba9d809ff8dfc412d4a (diff) | |
stub support for SK_FONTHOST_USES_FONTMGR
BUG=
Review URL: https://codereview.chromium.org/21563002
git-svn-id: http://skia.googlecode.com/svn/trunk@10485 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/ports/SkFontHost_linux.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp index 8825919a98..71438986e6 100644 --- a/src/ports/SkFontHost_linux.cpp +++ b/src/ports/SkFontHost_linux.cpp @@ -469,6 +469,8 @@ void FamilyTypeface::onGetFontDescriptor(SkFontDescriptor* desc, /////////////////////////////////////////////////////////////////////////////// +#ifndef SK_FONTHOST_USES_FONTMGR + SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace, const char familyName[], SkTypeface::Style style) { @@ -496,8 +498,6 @@ SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace, return tf; } -/////////////////////////////////////////////////////////////////////////////// - SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { if (NULL == stream || stream->getLength() <= 0) { SkDELETE(stream); @@ -518,6 +518,8 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { return stream.get() ? CreateTypefaceFromStream(stream) : NULL; } +#endif + /////////////////////////////////////////////////////////////////////////////// #include "SkFontMgr.h" |