summaryrefslogtreecommitdiff
path: root/core/fxge/include/fx_font.h
diff options
context:
space:
mode:
authorart-snake <art-snake@yandex-team.ru>2016-09-15 14:11:09 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-15 14:11:10 -0700
commitcde5101eb15b24519e89fa500fe37038bc8e2201 (patch)
treece3f6e9215769e4e1494479740cc4eaf957a109b /core/fxge/include/fx_font.h
parentd9871435eb7cea00a173baf780934f9d3525329a (diff)
downloadpdfium-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/include/fx_font.h')
-rw-r--r--core/fxge/include/fx_font.h35
1 files changed, 25 insertions, 10 deletions
diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h
index 9a976c44b7..00c9d6f559 100644
--- a/core/fxge/include/fx_font.h
+++ b/core/fxge/include/fx_font.h
@@ -19,7 +19,7 @@ typedef struct FT_FaceRec_* FXFT_Face;
typedef void* FXFT_Library;
class CFX_FaceCache;
-class CFX_FontCache;
+class CFX_GlyphBitmap;
class CFX_PathData;
class CFX_SizeGlyphCache;
@@ -106,13 +106,24 @@ class CFX_Font {
int* pFaceCount = nullptr);
FX_BOOL LoadClone(const CFX_Font* pFont);
- void SetFace(FXFT_Face face) { m_Face = face; }
+ void SetFace(FXFT_Face face);
void SetSubstFont(std::unique_ptr<CFX_SubstFont> subst) {
m_pSubstFont = std::move(subst);
}
#endif // PDF_ENABLE_XFA
- CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width = 0);
+ const CFX_GlyphBitmap* LoadGlyphBitmap(uint32_t glyph_index,
+ FX_BOOL bFontStyle,
+ const CFX_Matrix* pMatrix,
+ int dest_width,
+ int anti_alias,
+ int& text_flags) const;
+ const CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width) const;
+
+#ifdef _SKIA_SUPPORT_
+ CFX_TypeFace* GetDeviceCache() const;
+#endif
+
int GetGlyphWidth(uint32_t glyph_index);
int GetAscent() const;
int GetDescent() const;
@@ -139,7 +150,7 @@ class CFX_Font {
#endif
uint8_t* GetFontData() const { return m_pFontData; }
uint32_t GetSize() const { return m_dwSize; }
- void AdjustMMParams(int glyph_index, int width, int weight);
+ void AdjustMMParams(int glyph_index, int width, int weight) const;
static const size_t kAngleSkewArraySize = 30;
static const char s_AngleSkew[kAngleSkewArraySize];
@@ -156,10 +167,20 @@ class CFX_Font {
#endif // PDF_ENABLE_XFA
private:
+ friend class CFX_FaceCache;
+ CFX_PathData* LoadGlyphPathImpl(uint32_t glyph_index,
+ int dest_width = 0) const;
+
+ private:
+ CFX_FaceCache* GetFaceCache() const;
+
void ReleasePlatformResource();
void DeleteFace();
+ void ClearFaceCache();
+
FXFT_Face m_Face;
+ mutable CFX_FaceCache* m_FaceCache; // not owned.
std::unique_ptr<CFX_SubstFont> m_pSubstFont;
std::vector<uint8_t> m_pFontDataAllocation;
uint8_t* m_pFontData;
@@ -189,12 +210,6 @@ class CFX_FontFaceInfo {
uint32_t m_Charsets;
};
-class CFX_CountedFaceCache {
- public:
- CFX_FaceCache* m_Obj;
- uint32_t m_nCount;
-};
-
class CFX_GlyphBitmap {
public:
int m_Top;