Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2603)

Unified Diff: core/fxge/include/fx_font.h

Issue 2350763002: Revert of Pdfium: Fix fonts leaking on ClosePage. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fxge/include/cfx_renderdevice.h ('k') | core/fxge/include/ifx_renderdevicedriver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxge/include/fx_font.h
diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h
index 00c9d6f55970cd233461e0a08068a54fe964e7b8..9a976c44b77bd10ebde7156fdee4f77a107e3cc1 100644
--- a/core/fxge/include/fx_font.h
+++ b/core/fxge/include/fx_font.h
@@ -19,7 +19,7 @@
typedef void* FXFT_Library;
class CFX_FaceCache;
-class CFX_GlyphBitmap;
+class CFX_FontCache;
class CFX_PathData;
class CFX_SizeGlyphCache;
@@ -106,24 +106,13 @@
int* pFaceCount = nullptr);
FX_BOOL LoadClone(const CFX_Font* pFont);
- void SetFace(FXFT_Face face);
+ void SetFace(FXFT_Face face) { m_Face = face; }
void SetSubstFont(std::unique_ptr<CFX_SubstFont> subst) {
m_pSubstFont = std::move(subst);
}
#endif // PDF_ENABLE_XFA
- 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
-
+ CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width = 0);
int GetGlyphWidth(uint32_t glyph_index);
int GetAscent() const;
int GetDescent() const;
@@ -150,7 +139,7 @@
#endif
uint8_t* GetFontData() const { return m_pFontData; }
uint32_t GetSize() const { return m_dwSize; }
- void AdjustMMParams(int glyph_index, int width, int weight) const;
+ void AdjustMMParams(int glyph_index, int width, int weight);
static const size_t kAngleSkewArraySize = 30;
static const char s_AngleSkew[kAngleSkewArraySize];
@@ -167,20 +156,10 @@
#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;
@@ -210,6 +189,12 @@
uint32_t m_Charsets;
};
+class CFX_CountedFaceCache {
+ public:
+ CFX_FaceCache* m_Obj;
+ uint32_t m_nCount;
+};
+
class CFX_GlyphBitmap {
public:
int m_Top;
« no previous file with comments | « core/fxge/include/cfx_renderdevice.h ('k') | core/fxge/include/ifx_renderdevicedriver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698