summaryrefslogtreecommitdiff
path: root/core/fxge/include/ifx_renderdevicedriver.h
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-09-19 08:37:10 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-19 08:37:10 -0700
commitc48089977dc4d2a63d37e6668382c10b42e22a72 (patch)
tree931e8a2f17d997e55c9bead576f7f672196844c0 /core/fxge/include/ifx_renderdevicedriver.h
parentea3c3be83dae12ef682c68fc7cf906d790fd9f84 (diff)
downloadpdfium-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/ifx_renderdevicedriver.h')
-rw-r--r--core/fxge/include/ifx_renderdevicedriver.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/fxge/include/ifx_renderdevicedriver.h b/core/fxge/include/ifx_renderdevicedriver.h
index e9dbed913a..8b20cf0838 100644
--- a/core/fxge/include/ifx_renderdevicedriver.h
+++ b/core/fxge/include/ifx_renderdevicedriver.h
@@ -12,6 +12,7 @@
class CFX_DIBitmap;
class CFX_DIBSource;
class CFX_Font;
+class CFX_FontCache;
class CFX_GraphStateData;
class CFX_Matrix;
class CFX_PathData;
@@ -86,6 +87,7 @@ class IFX_RenderDeviceDriver {
virtual FX_BOOL DrawDeviceText(int nChars,
const FXTEXT_CHARPOS* pCharPos,
CFX_Font* pFont,
+ CFX_FontCache* pCache,
const CFX_Matrix* pObject2Device,
FX_FLOAT font_size,
uint32_t color);