diff options
| author |  robertphillips <robertphillips@google.com> | 2015-05-15 11:30:41 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-15 11:30:41 -0700 |
| commit | 465706820d0d373f76ab4831c286115ee0d86b7a (patch) | |
| tree | f9fc8bd24b4e517292b7d6eedc9d17863acce670 /src/core/SkFontMgr.cpp | |
| parent | daa57bfd4204f5a7d304c580bcf5ad99d0121e1f (diff) | |
Revert of Font variations. (patchset #26 id:500001 of https://codereview.chromium.org/1027373002/)
Reason for revert:
Appears to be breaking Linux ARM bots:
FAILED:
/usr/local/google/home/mosaic-role/slave/repo_clients/chromium_tot/chromium/src/../../prebuilt/toolchain/armv7a/bin/armv7a-cros-linux-gnueabi-g++
... -o obj/third_party/skia/src/ports/skia_library.SkFontHost_FreeType.o
../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:37:31: fatal error:
freetype/ftmm.h: No such file or directory
#include FT_MULTIPLE_MASTERS_H
^
compilation terminated.
Original issue's description:
> Font variations.
>
> Multiple Master and TrueType fonts support variation axes.
> This implements back-end support for axes on platforms which
> support it.
>
> Committed: https://skia.googlesource.com/skia/+/05773ed30920c0214d1433c07cf6360a05476c97
>
> Committed: https://skia.googlesource.com/skia/+/3489ee0f4fa34f124f9de090d12bdc2107d52aa9
TBR=reed@google.com,mtklein@google.com,djsollen@google.com,halcanary@google.com,bungeman@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1139123008
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; |