diff options
author | art-snake <art-snake@yandex-team.ru> | 2016-09-15 14:11:09 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-15 14:11:10 -0700 |
commit | cde5101eb15b24519e89fa500fe37038bc8e2201 (patch) | |
tree | ce3f6e9215769e4e1494479740cc4eaf957a109b /core/fxge/include/cfx_fontcache.h | |
parent | d9871435eb7cea00a173baf780934f9d3525329a (diff) | |
download | pdfium-cde5101eb15b24519e89fa500fe37038bc8e2201.tar.xz |
Fix memory leaking on ClosePage.chromium/2862
CFX_FontCache refactoring:
after this CL: Only one global CFX_FontCache used. Any cached items from it, are released, when its are not used.
BUG=79367,48791
The fonts was not cleared after unloading pages.
Test pdf:
http://www.nasa.gov/pdf/750614main_NASA_FY_2014_Budget_Estimates-508.pdf
For this file, we have ~5 fonts per page, which equal ~1 Mb per page.
In this PDF we have 670 pages, as result after slow scrolling(reading) full document we have ~600 Mb fonts data in memory.
memory usage of PDF Plugin:
before this CL: ~660 Mb
after this CL: ~100 Mb
Review-Url: https://codereview.chromium.org/2158023002
Diffstat (limited to 'core/fxge/include/cfx_fontcache.h')
-rw-r--r-- | core/fxge/include/cfx_fontcache.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/core/fxge/include/cfx_fontcache.h b/core/fxge/include/cfx_fontcache.h index d4a4dddaa5..dd9a176d19 100644 --- a/core/fxge/include/cfx_fontcache.h +++ b/core/fxge/include/cfx_fontcache.h @@ -8,6 +8,7 @@ #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" @@ -19,15 +20,21 @@ class CFX_FontCache { public: CFX_FontCache(); ~CFX_FontCache(); - CFX_FaceCache* GetCachedFace(CFX_Font* pFont); - void ReleaseCachedFace(CFX_Font* pFont); - void FreeCache(FX_BOOL bRelease = FALSE); + CFX_FaceCache* GetCachedFace(const CFX_Font* pFont); + void ReleaseCachedFace(const CFX_Font* pFont); #ifdef _SKIA_SUPPORT_ - CFX_TypeFace* GetDeviceCache(CFX_Font* pFont); + CFX_TypeFace* GetDeviceCache(const CFX_Font* pFont); #endif private: - using CFX_FTCacheMap = std::map<FXFT_Face, CFX_CountedFaceCache*>; + 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>>; CFX_FTCacheMap m_FTFaceMap; CFX_FTCacheMap m_ExtFaceMap; }; |