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/apple/fx_quartz_device.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/apple/fx_quartz_device.cpp')
| -rw-r--r-- | core/fxge/apple/fx_quartz_device.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index 400e29085c..6a0260b1d6 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -13,7 +13,6 @@ #include "core/fxcrt/include/fx_memory.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" @@ -746,7 +745,6 @@ FX_BOOL CFX_QuartzDeviceDriver::CG_DrawGlyphRun( int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pGlyphMatrix, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, @@ -812,7 +810,6 @@ FX_BOOL CFX_QuartzDeviceDriver::CG_DrawGlyphRun( FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) { @@ -832,8 +829,8 @@ FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, while (i < nChars) { if (pCharPos[i].m_bGlyphAdjust || font_size < 0) { if (i > 0) { - ret = CG_DrawGlyphRun(i, pCharPos, pFont, pCache, nullptr, - pObject2Device, font_size, color); + ret = CG_DrawGlyphRun(i, pCharPos, pFont, nullptr, pObject2Device, + font_size, color); if (!ret) { RestoreState(false); return ret; @@ -849,8 +846,8 @@ FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, char_pos->m_AdjustMatrix[0], char_pos->m_AdjustMatrix[1], char_pos->m_AdjustMatrix[2], char_pos->m_AdjustMatrix[3], 0, 0); } - ret = CG_DrawGlyphRun(1, char_pos, pFont, pCache, &glphy_matrix, - pObject2Device, font_size, color); + ret = CG_DrawGlyphRun(1, char_pos, pFont, &glphy_matrix, pObject2Device, + font_size, color); if (!ret) { RestoreState(false); return ret; @@ -864,7 +861,7 @@ FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, } } if (i > 0) { - ret = CG_DrawGlyphRun(i, pCharPos, pFont, pCache, nullptr, pObject2Device, + ret = CG_DrawGlyphRun(i, pCharPos, pFont, nullptr, pObject2Device, font_size, color); } RestoreState(false); |