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/ge/cfx_facecache.cpp | |
| 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/ge/cfx_facecache.cpp')
| -rw-r--r-- | core/fxge/ge/cfx_facecache.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fxge/ge/cfx_facecache.cpp b/core/fxge/ge/cfx_facecache.cpp index 2b8405941e..b78dd5b2ad 100644 --- a/core/fxge/ge/cfx_facecache.cpp +++ b/core/fxge/ge/cfx_facecache.cpp @@ -89,7 +89,7 @@ CFX_FaceCache::~CFX_FaceCache() { #endif } -CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont, +CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(const CFX_Font* pFont, uint32_t glyph_index, FX_BOOL bFontStyle, const CFX_Matrix* pMatrix, @@ -223,7 +223,7 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont, return pGlyphBitmap; } -const CFX_PathData* CFX_FaceCache::LoadGlyphPath(CFX_Font* pFont, +const CFX_PathData* CFX_FaceCache::LoadGlyphPath(const CFX_Font* pFont, uint32_t glyph_index, int dest_width) { if (!m_Face || glyph_index == kInvalidGlyphIndex || dest_width < 0) @@ -247,12 +247,12 @@ const CFX_PathData* CFX_FaceCache::LoadGlyphPath(CFX_Font* pFont, if (it != m_PathMap.end()) return it->second.get(); - CFX_PathData* pGlyphPath = pFont->LoadGlyphPath(glyph_index, dest_width); + CFX_PathData* pGlyphPath = pFont->LoadGlyphPathImpl(glyph_index, dest_width); m_PathMap[key] = std::unique_ptr<CFX_PathData>(pGlyphPath); return pGlyphPath; } -const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont, +const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(const CFX_Font* pFont, uint32_t glyph_index, FX_BOOL bFontStyle, const CFX_Matrix* pMatrix, @@ -349,7 +349,7 @@ const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont, } #ifdef _SKIA_SUPPORT_ -CFX_TypeFace* CFX_FaceCache::GetDeviceCache(CFX_Font* pFont) { +CFX_TypeFace* CFX_FaceCache::GetDeviceCache(const CFX_Font* pFont) { if (!m_pTypeface) { m_pTypeface = SkTypeface::MakeFromStream( @@ -365,7 +365,7 @@ void CFX_FaceCache::InitPlatform() {} #endif CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap( - CFX_Font* pFont, + const CFX_Font* pFont, const CFX_Matrix* pMatrix, const CFX_ByteString& FaceGlyphsKey, uint32_t glyph_index, |