summaryrefslogtreecommitdiff
path: root/core/fxge/include
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge/include')
-rw-r--r--core/fxge/include/cfx_facecache.h12
-rw-r--r--core/fxge/include/cfx_fontcache.h17
-rw-r--r--core/fxge/include/cfx_renderdevice.h3
-rw-r--r--core/fxge/include/fx_font.h35
-rw-r--r--core/fxge/include/ifx_renderdevicedriver.h2
5 files changed, 26 insertions, 43 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,
diff --git a/core/fxge/include/cfx_fontcache.h b/core/fxge/include/cfx_fontcache.h
index dd9a176d19..d4a4dddaa5 100644
--- a/core/fxge/include/cfx_fontcache.h
+++ b/core/fxge/include/cfx_fontcache.h
@@ -8,7 +8,6 @@
#define CORE_FXGE_INCLUDE_CFX_FONTCACHE_H_
#include <map>
-#include <memory>
#include "core/fxcrt/include/fx_system.h"
#include "core/fxge/include/fx_font.h"
@@ -20,21 +19,15 @@ class CFX_FontCache {
public:
CFX_FontCache();
~CFX_FontCache();
- CFX_FaceCache* GetCachedFace(const CFX_Font* pFont);
- void ReleaseCachedFace(const CFX_Font* pFont);
+ CFX_FaceCache* GetCachedFace(CFX_Font* pFont);
+ void ReleaseCachedFace(CFX_Font* pFont);
+ void FreeCache(FX_BOOL bRelease = FALSE);
#ifdef _SKIA_SUPPORT_
- CFX_TypeFace* GetDeviceCache(const CFX_Font* pFont);
+ CFX_TypeFace* GetDeviceCache(CFX_Font* pFont);
#endif
private:
- struct CountedFaceCache {
- CountedFaceCache();
- ~CountedFaceCache();
- std::unique_ptr<CFX_FaceCache> m_Obj;
- uint32_t m_nCount;
- };
-
- using CFX_FTCacheMap = std::map<FXFT_Face, std::unique_ptr<CountedFaceCache>>;
+ using CFX_FTCacheMap = std::map<FXFT_Face, CFX_CountedFaceCache*>;
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 3b9c93fc9b..9ca9a07220 100644
--- a/core/fxge/include/cfx_renderdevice.h
+++ b/core/fxge/include/cfx_renderdevice.h
@@ -14,6 +14,7 @@
#include "core/fxge/include/fx_font.h"
class CFX_Font;
+class CFX_FontCache;
class CFX_GraphStateData;
class IFX_RenderDeviceDriver;
@@ -207,6 +208,7 @@ 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,
@@ -214,6 +216,7 @@ 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 58d12bbb2a..fc207a60b2 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_GlyphBitmap;
+class CFX_FontCache;
class CFX_PathData;
class CFX_SizeGlyphCache;
@@ -115,24 +115,13 @@ class CFX_Font {
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;
@@ -159,7 +148,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) const;
+ void AdjustMMParams(int glyph_index, int width, int weight);
static const size_t kAngleSkewArraySize = 30;
static const char s_AngleSkew[kAngleSkewArraySize];
@@ -176,20 +165,10 @@ 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;
@@ -219,6 +198,12 @@ 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 e9dbed913a..8b20cf0838 100644
--- a/core/fxge/include/ifx_renderdevicedriver.h
+++ b/core/fxge/include/ifx_renderdevicedriver.h
@@ -12,6 +12,7 @@
class CFX_DIBitmap;
class CFX_DIBSource;
class CFX_Font;
+class CFX_FontCache;
class CFX_GraphStateData;
class CFX_Matrix;
class CFX_PathData;
@@ -86,6 +87,7 @@ 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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 07:35:08 +0000