summaryrefslogtreecommitdiff
path: root/core/fxge/include/cfx_fontcache.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge/include/cfx_fontcache.h')
-rw-r--r--core/fxge/include/cfx_fontcache.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/core/fxge/include/cfx_fontcache.h b/core/fxge/include/cfx_fontcache.h
index dd9a176d19..d4a4dddaa5 100644
--- a/core/fxge/include/cfx_fontcache.h
+++ b/core/fxge/include/cfx_fontcache.h
@@ -8,7 +8,6 @@
#define CORE_FXGE_INCLUDE_CFX_FONTCACHE_H_
#include <map>
-#include <memory>
#include "core/fxcrt/include/fx_system.h"
#include "core/fxge/include/fx_font.h"
@@ -20,21 +19,15 @@ class CFX_FontCache {
public:
CFX_FontCache();
~CFX_FontCache();
- CFX_FaceCache* GetCachedFace(const CFX_Font* pFont);
- void ReleaseCachedFace(const CFX_Font* pFont);
+ CFX_FaceCache* GetCachedFace(CFX_Font* pFont);
+ void ReleaseCachedFace(CFX_Font* pFont);
+ void FreeCache(FX_BOOL bRelease = FALSE);
#ifdef _SKIA_SUPPORT_
- CFX_TypeFace* GetDeviceCache(const CFX_Font* pFont);
+ CFX_TypeFace* GetDeviceCache(CFX_Font* pFont);
#endif
private:
- struct CountedFaceCache {
- CountedFaceCache();
- ~CountedFaceCache();
- std::unique_ptr<CFX_FaceCache> m_Obj;
- uint32_t m_nCount;
- };
-
- using CFX_FTCacheMap = std::map<FXFT_Face, std::unique_ptr<CountedFaceCache>>;
+ using CFX_FTCacheMap = std::map<FXFT_Face, CFX_CountedFaceCache*>;
CFX_FTCacheMap m_FTFaceMap;
CFX_FTCacheMap m_ExtFaceMap;
};