diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-09-19 08:37:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-19 08:37:10 -0700 |
| commit | c48089977dc4d2a63d37e6668382c10b42e22a72 (patch) | |
| tree | 931e8a2f17d997e55c9bead576f7f672196844c0 /core/fxge/include/cfx_facecache.h | |
| parent | ea3c3be83dae12ef682c68fc7cf906d790fd9f84 (diff) | |
| download | pdfium-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/cfx_facecache.h')
| -rw-r--r-- | core/fxge/include/cfx_facecache.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fxge/include/cfx_facecache.h b/core/fxge/include/cfx_facecache.h index fc1b28b523..6e437b49c3 100644 --- a/core/fxge/include/cfx_facecache.h +++ b/core/fxge/include/cfx_facecache.h @@ -16,34 +16,34 @@ class CFX_FaceCache { public: explicit CFX_FaceCache(FXFT_Face face); ~CFX_FaceCache(); - const CFX_GlyphBitmap* LoadGlyphBitmap(const CFX_Font* pFont, + const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont, uint32_t glyph_index, FX_BOOL bFontStyle, const CFX_Matrix* pMatrix, int dest_width, int anti_alias, int& text_flags); - const CFX_PathData* LoadGlyphPath(const CFX_Font* pFont, + const CFX_PathData* LoadGlyphPath(CFX_Font* pFont, uint32_t glyph_index, int dest_width); #ifdef _SKIA_SUPPORT_ - CFX_TypeFace* GetDeviceCache(const CFX_Font* pFont); + CFX_TypeFace* GetDeviceCache(CFX_Font* pFont); #endif private: - CFX_GlyphBitmap* RenderGlyph(const CFX_Font* pFont, + CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont, uint32_t glyph_index, FX_BOOL bFontStyle, const CFX_Matrix* pMatrix, int dest_width, int anti_alias); - CFX_GlyphBitmap* RenderGlyph_Nativetext(const CFX_Font* pFont, + CFX_GlyphBitmap* RenderGlyph_Nativetext(CFX_Font* pFont, uint32_t glyph_index, const CFX_Matrix* pMatrix, int dest_width, int anti_alias); - CFX_GlyphBitmap* LookUpGlyphBitmap(const CFX_Font* pFont, + CFX_GlyphBitmap* LookUpGlyphBitmap(CFX_Font* pFont, const CFX_Matrix* pMatrix, const CFX_ByteString& FaceGlyphsKey, uint32_t glyph_index, |