diff options
Diffstat (limited to 'src/core/SkFontMgr.cpp')
-rw-r--r-- | src/core/SkFontMgr.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/core/SkFontMgr.cpp b/src/core/SkFontMgr.cpp index 33da1db376..a03e05e0e4 100644 --- a/src/core/SkFontMgr.cpp +++ b/src/core/SkFontMgr.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "SkFontDescriptor.h" #include "SkFontMgr.h" #include "SkLazyPtr.h" #include "SkStream.h" @@ -134,20 +133,6 @@ SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, int ttcIndex) con return this->onCreateFromStream(stream, ttcIndex); } -SkTypeface* SkFontMgr::createFromFontData(SkFontData* data) const { - if (NULL == data) { - return NULL; - } - return this->onCreateFromFontData(data); -} - -// This implementation is temporary until it can be made pure virtual. -SkTypeface* SkFontMgr::onCreateFromFontData(SkFontData* data) const { - SkTypeface* ret = this->createFromStream(data->detachStream(), data->getIndex()); - delete data; - return ret; -} - SkTypeface* SkFontMgr::createFromFile(const char path[], int ttcIndex) const { if (NULL == path) { return NULL; |