Index: src/ports/SkFontMgr_android_parser.h |
diff --git a/src/ports/SkFontMgr_android_parser.h b/src/ports/SkFontMgr_android_parser.h |
index b841bc6d189d342de8029fa005b4b793b46e8953..efd8144f1463fa323f21e28efb073dacde82cce0 100644 |
--- a/src/ports/SkFontMgr_android_parser.h |
+++ b/src/ports/SkFontMgr_android_parser.h |
@@ -8,7 +8,7 @@ |
#ifndef SkFontMgr_android_parser_DEFINED |
#define SkFontMgr_android_parser_DEFINED |
-#include "SkFixed.h" |
+#include "SkFontMgr.h" |
#include "SkString.h" |
#include "SkTArray.h" |
#include "SkTDArray.h" |
@@ -73,12 +73,7 @@ struct FontFileInfo { |
int fIndex; |
int fWeight; |
enum class Style { kAuto, kNormal, kItalic } fStyle; |
- struct Axis { |
- Axis() : fTag(SkSetFourByteTag('\0','\0','\0','\0')), fValue(0) { } |
- SkFourByteTag fTag; |
- SkFixed fValue; |
- }; |
- SkTArray<Axis, true> fAxes; |
+ SkTArray<SkFontMgr::FontParameters::Axis, true> fAxes; |
}; |
/** |