diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-20 16:56:03 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-20 16:56:03 -0700 |
| commit | 5a5b6fb3759daf1201ffc9702f626f4b243922d0 (patch) | |
| tree | 1cc5b61a6f22b30d0d891912d4101f293635a751 /core/include/fxge | |
| parent | 0223be82e0afcfee7c501ad2754230353bff79ff (diff) | |
| download | pdfium-5a5b6fb3759daf1201ffc9702f626f4b243922d0.tar.xz | |
Make CFX_FontMgr member variables private. (try 2)
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1412733011 .
Diffstat (limited to 'core/include/fxge')
| -rw-r--r-- | core/include/fxge/fx_font.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index f36801584d..36a739f737 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -9,6 +9,7 @@ #include <map> +#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_system.h" #include "fx_dib.h" @@ -176,7 +177,7 @@ class CFX_FontMgr { public: CFX_FontMgr(); ~CFX_FontMgr(); - void InitFTLibrary(); + FXFT_Face GetCachedFace(const CFX_ByteString& face_name, int weight, FX_BOOL bItalic, @@ -207,13 +208,16 @@ class CFX_FontMgr { int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont); - void FreeCache(); FX_BOOL GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index); + CFX_FontMapper* GetBuiltinMapper() const { return m_pBuiltinMapper.get(); } + FXFT_Library GetFTLibrary() const { return m_FTLibrary; } + + private: + void InitFTLibrary(); - CFX_FontMapper* m_pBuiltinMapper; + nonstd::unique_ptr<CFX_FontMapper> m_pBuiltinMapper; std::map<CFX_ByteString, CTTFontDesc*> m_FaceMap; FXFT_Library m_FTLibrary; - FoxitFonts m_ExternalFonts[16]; }; class IFX_FontEnumerator { |