diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-21 17:07:24 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-21 17:07:24 -0700 |
| commit | 122ee21e38a15554c8c61edd21fda8c110be6072 (patch) | |
| tree | 208031600c134d48a8af2488fc337dab2e110bde /core/include | |
| parent | afaa98eeb161d60e76506a16d8b986203a7ec0b3 (diff) | |
| download | pdfium-122ee21e38a15554c8c61edd21fda8c110be6072.tar.xz | |
Merge to XFA: Make CFX_FontMgr member variables private. (try 2)
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1412733011 .
(cherry picked from commit 5a5b6fb3759daf1201ffc9702f626f4b243922d0)
Review URL: https://codereview.chromium.org/1414463006 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fxge/fx_font.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 2314fb3d08..37431203b3 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" @@ -236,6 +237,7 @@ class CFX_FontMgr { public: CFX_FontMgr(); ~CFX_FontMgr(); + void InitFTLibrary(); FXFT_Face GetCachedFace(const CFX_ByteString& face_name, int weight, @@ -267,13 +269,14 @@ 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; } - CFX_FontMapper* m_pBuiltinMapper; + private: + 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 { |