From cde5101eb15b24519e89fa500fe37038bc8e2201 Mon Sep 17 00:00:00 2001 From: art-snake Date: Thu, 15 Sep 2016 14:11:09 -0700 Subject: 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 Review-Url: https://codereview.chromium.org/2158023002 --- core/fpdfapi/fpdf_render/fpdf_render.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'core/fpdfapi/fpdf_render/fpdf_render.cpp') diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index 59c8397f54..8043f932bb 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -30,14 +30,13 @@ #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fpdfdoc/include/cpdf_occontext.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc) - : m_pPDFDoc(pPDFDoc), m_pFontCache(new CFX_FontCache) {} + : m_pPDFDoc(pPDFDoc) {} CPDF_DocRenderData::~CPDF_DocRenderData() { Clear(TRUE); @@ -63,15 +62,6 @@ void CPDF_DocRenderData::Clear(FX_BOOL bRelease) { m_TransferFuncMap.erase(curr_it); } } - - if (m_pFontCache) { - if (bRelease) { - delete m_pFontCache; - m_pFontCache = nullptr; - } else { - m_pFontCache->FreeCache(FALSE); - } - } } CPDF_Type3Cache* CPDF_DocRenderData::GetCachedType3(CPDF_Type3Font* pFont) { -- cgit v1.2.3