diff options
author | 2015-05-15 11:30:41 -0700 | |
---|---|---|
committer | 2015-05-15 11:30:41 -0700 | |
commit | 465706820d0d373f76ab4831c286115ee0d86b7a (patch) | |
tree | f9fc8bd24b4e517292b7d6eedc9d17863acce670 /src/ports/SkFontHost_FreeType_common.h | |
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/ports/SkFontHost_FreeType_common.h')
-rw-r--r-- | src/ports/SkFontHost_FreeType_common.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h index 8ae872c1da..857d2c8990 100644 --- a/src/ports/SkFontHost_FreeType_common.h +++ b/src/ports/SkFontHost_FreeType_common.h @@ -43,17 +43,9 @@ public: public: Scanner(); ~Scanner(); - struct AxisDefinition { - SkFourByteTag fTag; - SkFixed fMinimum; - SkFixed fDefault; - SkFixed fMaximum; - }; - using AxisDefinitions = SkSTArray<4, AxisDefinition, true>; bool recognizedFont(SkStream* stream, int* numFonts) const; bool scanFont(SkStream* stream, int ttcIndex, - SkString* name, SkFontStyle* style, bool* isFixedPitch, - AxisDefinitions* axes) const; + SkString* name, SkFontStyle* style, bool* isFixedPitch) const; private: FT_Face openFace(SkStream* stream, int ttcIndex, FT_Stream ftStream) const; FT_Library fLibrary; |