diff options
author | Tom Sepez <tsepez@chromium.org> | 2016-02-10 13:52:25 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2016-02-10 13:52:25 -0800 |
commit | e238549d212e97fe01dba3740949a98172c21454 (patch) | |
tree | 22fceab5e0a35b6d12a10f0504b0f4065f05b09e /core/src/fxge/android/fpf_skiafontmgr.h | |
parent | 0db900952c2aa76db801c9198923ce1b3d7c017d (diff) | |
download | pdfium-e238549d212e97fe01dba3740949a98172c21454.tar.xz |
Banish CFX_PtryArray to XFA side only.
The m_Operators array represents a heterogeneous instruction
stream, so leave it as a void* for now.
R=thestig@chromium.org, thestig@chromimum.org
Review URL: https://codereview.chromium.org/1676413002 .
Diffstat (limited to 'core/src/fxge/android/fpf_skiafontmgr.h')
-rw-r--r-- | core/src/fxge/android/fpf_skiafontmgr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h index 4625e8c605..f3ef9109f0 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.h +++ b/core/src/fxge/android/fpf_skiafontmgr.h @@ -10,6 +10,7 @@ #if _FX_OS_ == _FX_ANDROID_ #include <map> +#include <vector> #include "core/include/fxge/fpf.h" @@ -111,9 +112,10 @@ class CFPF_SkiaFontMgr : public IFPF_FontMgr { void ScanFile(const CFX_ByteStringC& file); void ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor* pFontDesc); void OutputSystemFonts(); + FX_BOOL m_bLoaded; - CFX_PtrArray m_FontFaces; FXFT_Library m_FTLibrary; + std::vector<CFPF_SkiaFontDescriptor*> m_FontFaces; std::map<FX_DWORD, CFPF_SkiaFont*> m_FamilyFonts; }; |