diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-09-19 08:37:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-19 08:37:10 -0700 |
| commit | c48089977dc4d2a63d37e6668382c10b42e22a72 (patch) | |
| tree | 931e8a2f17d997e55c9bead576f7f672196844c0 /core/fxge/include/cfx_fontcache.h | |
| parent | ea3c3be83dae12ef682c68fc7cf906d790fd9f84 (diff) | |
| download | pdfium-c48089977dc4d2a63d37e6668382c10b42e22a72.tar.xz | |
Revert of Pdfium: Fix fonts leaking on ClosePage. (patchset #10 id:180001 of https://codereview.chromium.org/2158023002/ )
Reason for revert:
Causes heap-use-after-free. See crbug.com/647612.
Original issue's description:
> Fix memory leaking on ClosePage.
> 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
>
> Committed: https://pdfium.googlesource.com/pdfium/+/cde5101eb15b24519e89fa500fe37038bc8e2201
TBR=tsepez@chromium.org,brucedawson@chromium.org,npm@chromium.org,art-snake@yandex-team.ru
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=79367,48791
Review-Url: https://codereview.chromium.org/2350763002
Diffstat (limited to 'core/fxge/include/cfx_fontcache.h')
| -rw-r--r-- | core/fxge/include/cfx_fontcache.h | 17 |
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; }; |