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 /xfa/fxgraphics/cfx_graphics.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 'xfa/fxgraphics/cfx_graphics.cpp')
| -rw-r--r-- | xfa/fxgraphics/cfx_graphics.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp index 068ed015f4..b9f8287ae4 100644 --- a/xfa/fxgraphics/cfx_graphics.cpp +++ b/xfa/fxgraphics/cfx_graphics.cpp @@ -1294,9 +1294,8 @@ FWL_Error CFX_Graphics::RenderDeviceShowText(const CFX_PointF& point, m.Concat(*matrix); } FX_BOOL result = m_renderDevice->DrawNormalText( - length, charPos, m_info.font, CFX_GEModule::Get()->GetFontCache(), - -m_info.fontSize * m_info.fontHScale, &m, m_info.fillColor->m_info.argb, - FXTEXT_CLEARTYPE); + length, charPos, m_info.font, -m_info.fontSize * m_info.fontHScale, &m, + m_info.fillColor->m_info.argb, FXTEXT_CLEARTYPE); if (!result) return FWL_Error::Indefinite; FX_Free(charPos); |