summaryrefslogtreecommitdiff
path: root/core/include/fxge
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-10-20 10:43:15 -0700
committerLei Zhang <thestig@chromium.org>2015-10-20 10:43:15 -0700
commit444ed783c014bbbde2eda7a25cf42bfc2234d7a8 (patch)
tree8acd0842faeed065ef12e1a528293c87222e82d4 /core/include/fxge
parent937840e1722d1f2b77d80575d6e710d760662c9c (diff)
downloadpdfium-444ed783c014bbbde2eda7a25cf42bfc2234d7a8.tar.xz
Revert "Make CFX_FontMgr member variables private."
This reverts commit c29bee029cd5fe3f8a4ceb580235ac2d0e5ce8fd. because it broke corpus tests. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1410733005 .
Diffstat (limited to 'core/include/fxge')
-rw-r--r--core/include/fxge/fx_font.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index d4f7a5dc04..f36801584d 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -9,7 +9,6 @@
#include <map>
-#include "../../../third_party/base/nonstd_unique_ptr.h"
#include "../fxcrt/fx_system.h"
#include "fx_dib.h"
@@ -177,7 +176,7 @@ class CFX_FontMgr {
public:
CFX_FontMgr();
~CFX_FontMgr();
-
+ void InitFTLibrary();
FXFT_Face GetCachedFace(const CFX_ByteString& face_name,
int weight,
FX_BOOL bItalic,
@@ -208,17 +207,13 @@ 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();
-
- nonstd::unique_ptr<CFX_FontMapper> m_pBuiltinMapper;
+ CFX_FontMapper* m_pBuiltinMapper;
std::map<CFX_ByteString, CTTFontDesc*> m_FaceMap;
FXFT_Library m_FTLibrary;
+ FoxitFonts m_ExternalFonts[16];
};
class IFX_FontEnumerator {