From 9972ff99285cea12a20026136e98c1e635a15010 Mon Sep 17 00:00:00 2001 From: art-snake Date: Tue, 20 Sep 2016 07:46:25 -0700 Subject: Refactor CFX_FontCache to have only one in GE Module. After this CL: only one global CFX_FontCache used. Any cached items from it, are released, when they are not being used. This is restore part of reverted CL: Original CL: https://codereview.chromium.org/2158023002 Revert reason: BUG=647612 Fix bug CL: https://codereview.chromium.org/2350193003 Review-Url: https://codereview.chromium.org/2350243002 --- core/fxge/include/cfx_facecache.h | 12 +++++----- core/fxge/include/cfx_fontcache.h | 17 ++++++++++----- core/fxge/include/cfx_renderdevice.h | 3 --- core/fxge/include/fx_font.h | 35 +++++++++++++++++++++--------- core/fxge/include/ifx_renderdevicedriver.h | 2 -- 5 files changed, 43 insertions(+), 26 deletions(-) (limited to 'core/fxge/include') diff --git a/core/fxge/include/cfx_facecache.h b/core/fxge/include/cfx_facecache.h index 6e437b49c3..fc1b28b523 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(CFX_Font* pFont, + const CFX_GlyphBitmap* LoadGlyphBitmap(const 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(CFX_Font* pFont, + const CFX_PathData* LoadGlyphPath(const CFX_Font* pFont, uint32_t glyph_index, int dest_width); #ifdef _SKIA_SUPPORT_ - CFX_TypeFace* GetDeviceCache(CFX_Font* pFont); + CFX_TypeFace* GetDeviceCache(const CFX_Font* pFont); #endif private: - CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont, + CFX_GlyphBitmap* RenderGlyph(const CFX_Font* pFont, uint32_t glyph_index, FX_BOOL bFontStyle, const CFX_Matrix* pMatrix, int dest_width, int anti_alias); - CFX_GlyphBitmap* RenderGlyph_Nativetext(CFX_Font* pFont, + CFX_GlyphBitmap* RenderGlyph_Nativetext(const CFX_Font* pFont, uint32_t glyph_index, const CFX_Matrix* pMatrix, int dest_width, int anti_alias); - CFX_GlyphBitmap* LookUpGlyphBitmap(CFX_Font* pFont, + CFX_GlyphBitmap* LookUpGlyphBitmap(const CFX_Font* pFont, const CFX_Matrix* pMatrix, const CFX_ByteString& FaceGlyphsKey, uint32_t glyph_index, diff --git a/core/fxge/include/cfx_fontcache.h b/core/fxge/include/cfx_fontcache.h index d4a4dddaa5..dd9a176d19 100644 --- a/core/fxge/include/cfx_fontcache.h +++ b/core/fxge/include/cfx_fontcache.h @@ -8,6 +8,7 @@ #define CORE_FXGE_INCLUDE_CFX_FONTCACHE_H_ #include +#include #include "core/fxcrt/include/fx_system.h" #include "core/fxge/include/fx_font.h" @@ -19,15 +20,21 @@ class CFX_FontCache { public: CFX_FontCache(); ~CFX_FontCache(); - CFX_FaceCache* GetCachedFace(CFX_Font* pFont); - void ReleaseCachedFace(CFX_Font* pFont); - void FreeCache(FX_BOOL bRelease = FALSE); + CFX_FaceCache* GetCachedFace(const CFX_Font* pFont); + void ReleaseCachedFace(const CFX_Font* pFont); #ifdef _SKIA_SUPPORT_ - CFX_TypeFace* GetDeviceCache(CFX_Font* pFont); + CFX_TypeFace* GetDeviceCache(const CFX_Font* pFont); #endif private: - using CFX_FTCacheMap = std::map; + struct CountedFaceCache { + CountedFaceCache(); + ~CountedFaceCache(); + std::unique_ptr m_Obj; + uint32_t m_nCount; + }; + + using CFX_FTCacheMap = std::map>; CFX_FTCacheMap m_FTFaceMap; CFX_FTCacheMap m_ExtFaceMap; }; diff --git a/core/fxge/include/cfx_renderdevice.h b/core/fxge/include/cfx_renderdevice.h index 9ca9a07220..3b9c93fc9b 100644 --- a/core/fxge/include/cfx_renderdevice.h +++ b/core/fxge/include/cfx_renderdevice.h @@ -14,7 +14,6 @@ #include "core/fxge/include/fx_font.h" class CFX_Font; -class CFX_FontCache; class CFX_GraphStateData; class IFX_RenderDeviceDriver; @@ -208,7 +207,6 @@ class CFX_RenderDevice { FX_BOOL DrawNormalText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, FX_FLOAT font_size, const CFX_Matrix* pText2Device, uint32_t fill_color, @@ -216,7 +214,6 @@ class CFX_RenderDevice { FX_BOOL DrawTextPath(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, FX_FLOAT font_size, const CFX_Matrix* pText2User, const CFX_Matrix* pUser2Device, diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h index fc207a60b2..58d12bbb2a 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; @@ -115,13 +115,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 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; @@ -148,7 +159,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]; @@ -165,10 +176,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 m_pSubstFont; std::vector m_pFontDataAllocation; uint8_t* m_pFontData; @@ -198,12 +219,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; diff --git a/core/fxge/include/ifx_renderdevicedriver.h b/core/fxge/include/ifx_renderdevicedriver.h index 8b20cf0838..e9dbed913a 100644 --- a/core/fxge/include/ifx_renderdevicedriver.h +++ b/core/fxge/include/ifx_renderdevicedriver.h @@ -12,7 +12,6 @@ class CFX_DIBitmap; class CFX_DIBSource; class CFX_Font; -class CFX_FontCache; class CFX_GraphStateData; class CFX_Matrix; class CFX_PathData; @@ -87,7 +86,6 @@ 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); -- cgit v1.2.3