From c48089977dc4d2a63d37e6668382c10b42e22a72 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 19 Sep 2016 08:37:10 -0700 Subject: 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 --- core/fxge/apple/fx_apple_platform.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/fxge/apple/fx_apple_platform.cpp') diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index 239a6e50f9..be429e9a43 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -18,6 +18,7 @@ #include "core/fxge/ge/cfx_cliprgn.h" #include "core/fxge/ge/fx_text_int.h" #include "core/fxge/include/cfx_facecache.h" +#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/fx_freetype.h" @@ -32,6 +33,7 @@ FX_BOOL CGDrawGlyphRun(CGContextRef pContext, int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, + CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t argb) { @@ -104,6 +106,7 @@ void CFX_AggDeviceDriver::DestroyPlatform() { FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, + CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t argb) { @@ -152,8 +155,8 @@ FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars, else CGContextClipToRect(ctx, rect_cg); - FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pObject2Device, - font_size, argb); + FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pCache, + pObject2Device, font_size, argb); if (pImageCG) CGImageRelease(pImageCG); CGContextRestoreGState(ctx); @@ -167,7 +170,7 @@ void CFX_FaceCache::InitPlatform() {} void CFX_FaceCache::DestroyPlatform() {} CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph_Nativetext( - const CFX_Font* pFont, + CFX_Font* pFont, uint32_t glyph_index, const CFX_Matrix* pMatrix, int dest_width, -- cgit v1.2.3