diff options
Diffstat (limited to 'core')
24 files changed, 166 insertions, 199 deletions
diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp index b2a3cd4ef2..d3909ceaec 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp @@ -21,7 +21,6 @@ #include "core/fpdfapi/fpdf_render/render_int.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcodec/include/JBig2_DocumentContext.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_unicodeencoding.h" #include "core/fxge/include/fx_font.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index 59c8397f54..8043f932bb 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -30,14 +30,13 @@ #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fpdfdoc/include/cpdf_occontext.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc) - : m_pPDFDoc(pPDFDoc), m_pFontCache(new CFX_FontCache) {} + : m_pPDFDoc(pPDFDoc) {} CPDF_DocRenderData::~CPDF_DocRenderData() { Clear(TRUE); @@ -63,15 +62,6 @@ void CPDF_DocRenderData::Clear(FX_BOOL bRelease) { m_TransferFuncMap.erase(curr_it); } } - - if (m_pFontCache) { - if (bRelease) { - delete m_pFontCache; - m_pFontCache = nullptr; - } else { - m_pFontCache->FreeCache(FALSE); - } - } } CPDF_Type3Cache* CPDF_DocRenderData::GetCachedType3(CPDF_Type3Font* pFont) { diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp index 265948f1d5..991b57ab7f 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -25,7 +25,6 @@ #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h" #include "core/fxge/include/cfx_autofontcache.h" #include "core/fxge/include/cfx_facecache.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_graphstatedata.h" @@ -435,9 +434,6 @@ FX_BOOL CPDF_TextRenderer::DrawTextPath(CFX_RenderDevice* pDevice, FX_ARGB stroke_argb, CFX_PathData* pClippingPath, int nFlag) { - CFX_FontCache* pCache = - pFont->m_pDocument ? pFont->m_pDocument->GetRenderData()->GetFontCache() - : nullptr; CPDF_CharPosList CharPosList; CharPosList.Load(nChars, pCharCodes, pCharPos, pFont, font_size); if (CharPosList.m_nChars == 0) @@ -452,10 +448,10 @@ FX_BOOL CPDF_TextRenderer::DrawTextPath(CFX_RenderDevice* pDevice, auto* font = fontPosition == -1 ? &pFont->m_Font : pFont->m_FontFallbacks[fontPosition].get(); - if (!pDevice->DrawTextPath( - i - startIndex, CharPosList.m_pCharPos + startIndex, font, pCache, - font_size, pText2User, pUser2Device, pGraphState, fill_argb, - stroke_argb, pClippingPath, nFlag)) { + if (!pDevice->DrawTextPath(i - startIndex, + CharPosList.m_pCharPos + startIndex, font, + font_size, pText2User, pUser2Device, pGraphState, + fill_argb, stroke_argb, pClippingPath, nFlag)) { bDraw = false; } fontPosition = curFontPosition; @@ -464,7 +460,7 @@ FX_BOOL CPDF_TextRenderer::DrawTextPath(CFX_RenderDevice* pDevice, auto* font = fontPosition == -1 ? &pFont->m_Font : pFont->m_FontFallbacks[fontPosition].get(); if (!pDevice->DrawTextPath(CharPosList.m_nChars - startIndex, - CharPosList.m_pCharPos + startIndex, font, pCache, + CharPosList.m_pCharPos + startIndex, font, font_size, pText2User, pUser2Device, pGraphState, fill_argb, stroke_argb, pClippingPath, nFlag)) { bDraw = false; @@ -540,9 +536,6 @@ FX_BOOL CPDF_TextRenderer::DrawNormalText(CFX_RenderDevice* pDevice, const CFX_Matrix* pText2Device, FX_ARGB fill_argb, const CPDF_RenderOptions* pOptions) { - CFX_FontCache* pCache = - pFont->m_pDocument ? pFont->m_pDocument->GetRenderData()->GetFontCache() - : nullptr; CPDF_CharPosList CharPosList; CharPosList.Load(nChars, pCharCodes, pCharPos, pFont, font_size); if (CharPosList.m_nChars == 0) @@ -585,7 +578,7 @@ FX_BOOL CPDF_TextRenderer::DrawNormalText(CFX_RenderDevice* pDevice, ? &pFont->m_Font : pFont->m_FontFallbacks[fontPosition].get(); if (!pDevice->DrawNormalText( - i - startIndex, CharPosList.m_pCharPos + startIndex, font, pCache, + i - startIndex, CharPosList.m_pCharPos + startIndex, font, font_size, pText2Device, fill_argb, FXGE_flags)) { bDraw = false; } @@ -596,7 +589,7 @@ FX_BOOL CPDF_TextRenderer::DrawNormalText(CFX_RenderDevice* pDevice, : pFont->m_FontFallbacks[fontPosition].get(); if (!pDevice->DrawNormalText(CharPosList.m_nChars - startIndex, CharPosList.m_pCharPos + startIndex, font, - pCache, font_size, pText2Device, fill_argb, + font_size, pText2Device, fill_argb, FXGE_flags)) { bDraw = false; } @@ -627,23 +620,9 @@ void CPDF_RenderStatus::DrawTextPathWithPattern(const CPDF_TextObject* textobj, RenderSingleObject(&path, pObj2Device); return; } - CFX_FontCache* pCache; - if (pFont->m_pDocument) { - pCache = pFont->m_pDocument->GetRenderData()->GetFontCache(); - } else { - pCache = CFX_GEModule::Get()->GetFontCache(); - } CPDF_CharPosList CharPosList; CharPosList.Load(textobj->m_nChars, textobj->m_pCharCodes, textobj->m_pCharPos, pFont, font_size); - std::vector<CFX_FaceCache*> faceCaches; - std::vector<CFX_AutoFontCache> autoFontCaches; - faceCaches.push_back(pCache->GetCachedFace(&pFont->m_Font)); - autoFontCaches.push_back(CFX_AutoFontCache(pCache, &pFont->m_Font)); - for (const auto& font : pFont->m_FontFallbacks) { - faceCaches.push_back(pCache->GetCachedFace(font.get())); - autoFontCaches.push_back(CFX_AutoFontCache(pCache, font.get())); - } for (uint32_t i = 0; i < CharPosList.m_nChars; i++) { FXTEXT_CHARPOS& charpos = CharPosList.m_pCharPos[i]; auto font = @@ -651,8 +630,7 @@ void CPDF_RenderStatus::DrawTextPathWithPattern(const CPDF_TextObject* textobj, ? &pFont->m_Font : pFont->m_FontFallbacks[charpos.m_FallbackFontPosition].get(); const CFX_PathData* pPath = - faceCaches[charpos.m_FallbackFontPosition + 1]->LoadGlyphPath( - font, charpos.m_GlyphIndex, charpos.m_FontCharWidth); + font->LoadGlyphPath(charpos.m_GlyphIndex, charpos.m_FontCharWidth); if (!pPath) { continue; } diff --git a/core/fpdfapi/fpdf_render/render_int.h b/core/fpdfapi/fpdf_render/render_int.h index 672e5923df..afd9c83b44 100644 --- a/core/fpdfapi/fpdf_render/render_int.h +++ b/core/fpdfapi/fpdf_render/render_int.h @@ -21,7 +21,6 @@ class CCodec_Jbig2Context; class CCodec_ScanlineDecoder; -class CFX_FontCache; class CFX_GlyphBitmap; class CFX_ImageTransformer; class CFX_PathData; @@ -71,7 +70,6 @@ class CPDF_DocRenderData { ~CPDF_DocRenderData(); CPDF_Type3Cache* GetCachedType3(CPDF_Type3Font* pFont); CPDF_TransferFunc* GetTransferFunc(CPDF_Object* pObj); - CFX_FontCache* GetFontCache() { return m_pFontCache; } void Clear(FX_BOOL bRelease = FALSE); void ReleaseCachedType3(CPDF_Type3Font* pFont); void ReleaseTransferFunc(CPDF_Object* pObj); @@ -83,7 +81,6 @@ class CPDF_DocRenderData { std::map<CPDF_Object*, CPDF_CountedObject<CPDF_TransferFunc>*>; CPDF_Document* m_pPDFDoc; - CFX_FontCache* m_pFontCache; CPDF_Type3CacheMap m_Type3FaceMap; CPDF_TransferFuncMap m_TransferFuncMap; }; diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp index 9db10ac3c6..bb3d7af400 100644 --- a/core/fxge/agg/fx_agg_driver.cpp +++ b/core/fxge/agg/fx_agg_driver.cpp @@ -13,7 +13,6 @@ #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/cfx_cliprgn.h" #include "core/fxge/ge/fx_text_int.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_graphstatedata.h" @@ -459,7 +458,6 @@ void CFX_AggDeviceDriver::DestroyPlatform() {} FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) { diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h index db6807cb3d..47ae470cc1 100644 --- a/core/fxge/agg/fx_agg_driver.h +++ b/core/fxge/agg/fx_agg_driver.h @@ -16,7 +16,6 @@ #include "third_party/agg23/agg_rasterizer_scanline_aa.h" class CFX_ClipRgn; -class CFX_FontCache; class CFX_GraphStateData; class CFX_Matrix; class CFX_PathData; @@ -93,7 +92,6 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver { 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) override; diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h index a401086f35..9443b5da01 100644 --- a/core/fxge/apple/apple_int.h +++ b/core/fxge/apple/apple_int.h @@ -21,8 +21,6 @@ #include <Carbon/Carbon.h> #endif -class CFX_FontCache; - class CQuartz2D { public: void* createGraphics(CFX_DIBitmap* bitmap); @@ -110,7 +108,6 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { 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) override; @@ -127,7 +124,6 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { FX_BOOL CG_DrawGlyphRun(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pGlyphMatrix, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index be429e9a43..239a6e50f9 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -18,7 +18,6 @@ #include "core/fxge/ge/cfx_cliprgn.h" #include "core/fxge/ge/fx_text_int.h" #include "core/fxge/include/cfx_facecache.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/fx_freetype.h" @@ -33,7 +32,6 @@ FX_BOOL CGDrawGlyphRun(CGContextRef pContext, int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t argb) { @@ -106,7 +104,6 @@ void CFX_AggDeviceDriver::DestroyPlatform() { FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t argb) { @@ -155,8 +152,8 @@ FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars, else CGContextClipToRect(ctx, rect_cg); - FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pCache, - pObject2Device, font_size, argb); + FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pObject2Device, + font_size, argb); if (pImageCG) CGImageRelease(pImageCG); CGContextRestoreGState(ctx); @@ -170,7 +167,7 @@ void CFX_FaceCache::InitPlatform() {} void CFX_FaceCache::DestroyPlatform() {} CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph_Nativetext( - CFX_Font* pFont, + const CFX_Font* pFont, uint32_t glyph_index, const CFX_Matrix* pMatrix, int dest_width, diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index 400e29085c..6a0260b1d6 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -13,7 +13,6 @@ #include "core/fxcrt/include/fx_memory.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" @@ -746,7 +745,6 @@ FX_BOOL CFX_QuartzDeviceDriver::CG_DrawGlyphRun( int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pGlyphMatrix, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, @@ -812,7 +810,6 @@ FX_BOOL CFX_QuartzDeviceDriver::CG_DrawGlyphRun( FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) { @@ -832,8 +829,8 @@ FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, while (i < nChars) { if (pCharPos[i].m_bGlyphAdjust || font_size < 0) { if (i > 0) { - ret = CG_DrawGlyphRun(i, pCharPos, pFont, pCache, nullptr, - pObject2Device, font_size, color); + ret = CG_DrawGlyphRun(i, pCharPos, pFont, nullptr, pObject2Device, + font_size, color); if (!ret) { RestoreState(false); return ret; @@ -849,8 +846,8 @@ FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, char_pos->m_AdjustMatrix[0], char_pos->m_AdjustMatrix[1], char_pos->m_AdjustMatrix[2], char_pos->m_AdjustMatrix[3], 0, 0); } - ret = CG_DrawGlyphRun(1, char_pos, pFont, pCache, &glphy_matrix, - pObject2Device, font_size, color); + ret = CG_DrawGlyphRun(1, char_pos, pFont, &glphy_matrix, pObject2Device, + font_size, color); if (!ret) { RestoreState(false); return ret; @@ -864,7 +861,7 @@ FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, } } if (i > 0) { - ret = CG_DrawGlyphRun(i, pCharPos, pFont, pCache, nullptr, pObject2Device, + ret = CG_DrawGlyphRun(i, pCharPos, pFont, nullptr, pObject2Device, font_size, color); } RestoreState(false); diff --git a/core/fxge/ge/cfx_facecache.cpp b/core/fxge/ge/cfx_facecache.cpp index 2b8405941e..b78dd5b2ad 100644 --- a/core/fxge/ge/cfx_facecache.cpp +++ b/core/fxge/ge/cfx_facecache.cpp @@ -89,7 +89,7 @@ CFX_FaceCache::~CFX_FaceCache() { #endif } -CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont, +CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(const CFX_Font* pFont, uint32_t glyph_index, FX_BOOL bFontStyle, const CFX_Matrix* pMatrix, @@ -223,7 +223,7 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont, return pGlyphBitmap; } -const CFX_PathData* CFX_FaceCache::LoadGlyphPath(CFX_Font* pFont, +const CFX_PathData* CFX_FaceCache::LoadGlyphPath(const CFX_Font* pFont, uint32_t glyph_index, int dest_width) { if (!m_Face || glyph_index == kInvalidGlyphIndex || dest_width < 0) @@ -247,12 +247,12 @@ const CFX_PathData* CFX_FaceCache::LoadGlyphPath(CFX_Font* pFont, if (it != m_PathMap.end()) return it->second.get(); - CFX_PathData* pGlyphPath = pFont->LoadGlyphPath(glyph_index, dest_width); + CFX_PathData* pGlyphPath = pFont->LoadGlyphPathImpl(glyph_index, dest_width); m_PathMap[key] = std::unique_ptr<CFX_PathData>(pGlyphPath); return pGlyphPath; } -const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont, +const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(const CFX_Font* pFont, uint32_t glyph_index, FX_BOOL bFontStyle, const CFX_Matrix* pMatrix, @@ -349,7 +349,7 @@ const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont, } #ifdef _SKIA_SUPPORT_ -CFX_TypeFace* CFX_FaceCache::GetDeviceCache(CFX_Font* pFont) { +CFX_TypeFace* CFX_FaceCache::GetDeviceCache(const CFX_Font* pFont) { if (!m_pTypeface) { m_pTypeface = SkTypeface::MakeFromStream( @@ -365,7 +365,7 @@ void CFX_FaceCache::InitPlatform() {} #endif CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap( - CFX_Font* pFont, + const CFX_Font* pFont, const CFX_Matrix* pMatrix, const CFX_ByteString& FaceGlyphsKey, uint32_t glyph_index, diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index feea8b0aa1..b184711211 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -8,6 +8,8 @@ #include "core/fpdfapi/fpdf_font/include/cpdf_font.h" #include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/include/cfx_facecache.h" +#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fontmgr.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_pathdata.h" @@ -224,6 +226,7 @@ CFX_Font::CFX_Font() m_pOwnedStream(nullptr), #endif // PDF_ENABLE_XFA m_Face(nullptr), + m_FaceCache(nullptr), m_pFontData(nullptr), m_pGsubData(nullptr), m_dwSize(0), @@ -262,8 +265,15 @@ FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) { m_pPlatformFont = pFont->m_pPlatformFont; #endif m_pOwnedStream = pFont->m_pOwnedStream; + m_FaceCache = pFont->GetFaceCache(); return TRUE; } + +void CFX_Font::SetFace(FXFT_Face face) { + ClearFaceCache(); + m_Face = face; +} + #endif // PDF_ENABLE_XFA CFX_Font::~CFX_Font() { @@ -279,10 +289,7 @@ CFX_Font::~CFX_Font() { FXFT_Clear_Face_External_Stream(m_Face); } #endif // PDF_ENABLE_XFA - if (m_bEmbedded) - DeleteFace(); - else - CFX_GEModule::Get()->GetFontMgr()->ReleaseFace(m_Face); + DeleteFace(); } #ifdef PDF_ENABLE_XFA delete m_pOwnedStream; @@ -294,7 +301,12 @@ CFX_Font::~CFX_Font() { } void CFX_Font::DeleteFace() { - FXFT_Done_Face(m_Face); + ClearFaceCache(); + if (m_bEmbedded) { + FXFT_Done_Face(m_Face); + } else { + CFX_GEModule::Get()->GetFontMgr()->ReleaseFace(m_Face); + } m_Face = nullptr; } @@ -537,6 +549,20 @@ int CFX_Font::GetMaxAdvanceWidth() const { FXFT_Get_Face_MaxAdvanceWidth(m_Face)); } +CFX_FaceCache* CFX_Font::GetFaceCache() const { + if (!m_FaceCache) { + m_FaceCache = CFX_GEModule::Get()->GetFontCache()->GetCachedFace(this); + } + return m_FaceCache; +} + +void CFX_Font::ClearFaceCache() { + if (!m_FaceCache) + return; + CFX_GEModule::Get()->GetFontCache()->ReleaseCachedFace(this); + m_FaceCache = nullptr; +} + int CFX_Font::GetULPos() const { if (!m_Face) return 0; @@ -553,7 +579,9 @@ int CFX_Font::GetULthickness() const { FXFT_Get_Face_UnderLineThickness(m_Face)); } -void CFX_Font::AdjustMMParams(int glyph_index, int dest_width, int weight) { +void CFX_Font::AdjustMMParams(int glyph_index, + int dest_width, + int weight) const { FXFT_MM_Var pMasters = nullptr; FXFT_Get_MM_Var(m_Face, &pMasters); if (!pMasters) @@ -593,7 +621,8 @@ void CFX_Font::AdjustMMParams(int glyph_index, int dest_width, int weight) { FXFT_Set_MM_Design_Coordinates(m_Face, 2, coords); } -CFX_PathData* CFX_Font::LoadGlyphPath(uint32_t glyph_index, int dest_width) { +CFX_PathData* CFX_Font::LoadGlyphPathImpl(uint32_t glyph_index, + int dest_width) const { if (!m_Face) return nullptr; FXFT_Set_Pixel_Sizes(m_Face, 0, 64); @@ -662,3 +691,24 @@ CFX_PathData* CFX_Font::LoadGlyphPath(uint32_t glyph_index, int dest_width) { pPath->GetPoints()[params.m_PointCount - 1].m_Flag |= FXPT_CLOSEFIGURE; return pPath; } + +const CFX_GlyphBitmap* CFX_Font::LoadGlyphBitmap(uint32_t glyph_index, + FX_BOOL bFontStyle, + const CFX_Matrix* pMatrix, + int dest_width, + int anti_alias, + int& text_flags) const { + return GetFaceCache()->LoadGlyphBitmap(this, glyph_index, bFontStyle, pMatrix, + dest_width, anti_alias, text_flags); +} + +const CFX_PathData* CFX_Font::LoadGlyphPath(uint32_t glyph_index, + int dest_width) const { + return GetFaceCache()->LoadGlyphPath(this, glyph_index, dest_width); +} + +#ifdef _SKIA_SUPPORT_ +CFX_TypeFace* CFX_Font::GetDeviceCache() const { + return GetFaceCache()->GetDeviceCache(this); +} +#endif diff --git a/core/fxge/ge/cfx_fontcache.cpp b/core/fxge/ge/cfx_fontcache.cpp index 3ecd83c33f..acae018c83 100644 --- a/core/fxge/ge/cfx_fontcache.cpp +++ b/core/fxge/ge/cfx_fontcache.cpp @@ -10,38 +10,43 @@ #include "core/fxge/include/fx_font.h" #include "core/fxge/include/fx_freetype.h" +CFX_FontCache::CountedFaceCache::CountedFaceCache() {} + +CFX_FontCache::CountedFaceCache::~CountedFaceCache() {} + CFX_FontCache::CFX_FontCache() {} CFX_FontCache::~CFX_FontCache() { - FreeCache(TRUE); + ASSERT(m_ExtFaceMap.empty()); + ASSERT(m_FTFaceMap.empty()); } -CFX_FaceCache* CFX_FontCache::GetCachedFace(CFX_Font* pFont) { +CFX_FaceCache* CFX_FontCache::GetCachedFace(const CFX_Font* pFont) { FXFT_Face face = pFont->GetFace(); const bool bExternal = !face; CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap; auto it = map.find(face); if (it != map.end()) { - CFX_CountedFaceCache* counted_face_cache = it->second; + CountedFaceCache* counted_face_cache = it->second.get(); counted_face_cache->m_nCount++; - return counted_face_cache->m_Obj; + return counted_face_cache->m_Obj.get(); } - CFX_FaceCache* face_cache = new CFX_FaceCache(bExternal ? nullptr : face); - CFX_CountedFaceCache* counted_face_cache = new CFX_CountedFaceCache; + std::unique_ptr<CountedFaceCache> counted_face_cache(new CountedFaceCache); counted_face_cache->m_nCount = 2; - counted_face_cache->m_Obj = face_cache; - map[face] = counted_face_cache; + CFX_FaceCache* face_cache = new CFX_FaceCache(bExternal ? nullptr : face); + counted_face_cache->m_Obj.reset(face_cache); + map[face] = std::move(counted_face_cache); return face_cache; } #ifdef _SKIA_SUPPORT_ -CFX_TypeFace* CFX_FontCache::GetDeviceCache(CFX_Font* pFont) { +CFX_TypeFace* CFX_FontCache::GetDeviceCache(const CFX_Font* pFont) { return GetCachedFace(pFont)->GetDeviceCache(pFont); } #endif -void CFX_FontCache::ReleaseCachedFace(CFX_Font* pFont) { +void CFX_FontCache::ReleaseCachedFace(const CFX_Font* pFont) { FXFT_Face face = pFont->GetFace(); const bool bExternal = !face; CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap; @@ -50,30 +55,10 @@ void CFX_FontCache::ReleaseCachedFace(CFX_Font* pFont) { if (it == map.end()) return; - CFX_CountedFaceCache* counted_face_cache = it->second; - if (counted_face_cache->m_nCount > 1) { + CountedFaceCache* counted_face_cache = it->second.get(); + if (counted_face_cache->m_nCount > 2) { counted_face_cache->m_nCount--; - } -} - -void CFX_FontCache::FreeCache(FX_BOOL bRelease) { - for (auto it = m_FTFaceMap.begin(); it != m_FTFaceMap.end();) { - auto curr_it = it++; - CFX_CountedFaceCache* cache = curr_it->second; - if (bRelease || cache->m_nCount < 2) { - delete cache->m_Obj; - delete cache; - m_FTFaceMap.erase(curr_it); - } - } - - for (auto it = m_ExtFaceMap.begin(); it != m_ExtFaceMap.end();) { - auto curr_it = it++; - CFX_CountedFaceCache* cache = curr_it->second; - if (bRelease || cache->m_nCount < 2) { - delete cache->m_Obj; - delete cache; - m_ExtFaceMap.erase(curr_it); - } + } else { + map.erase(it); } } diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/ge/cfx_renderdevice.cpp index ad05ef743b..11f0087f92 100644 --- a/core/fxge/ge/cfx_renderdevice.cpp +++ b/core/fxge/ge/cfx_renderdevice.cpp @@ -9,7 +9,6 @@ #include "core/fxcrt/include/fx_safe_types.h" #include "core/fxge/include/cfx_autofontcache.h" #include "core/fxge/include/cfx_facecache.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" @@ -824,7 +823,6 @@ bool CFX_RenderDevice::SetBitsWithMask(const CFX_DIBSource* pBitmap, FX_BOOL CFX_RenderDevice::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, @@ -833,9 +831,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, if (m_DeviceClass != FXDC_DISPLAY) { if (!(text_flags & FXTEXT_PRINTGRAPHICTEXT)) { if (ShouldDrawDeviceText(pFont, text_flags) && - m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pCache, - pText2Device, font_size, - fill_color)) { + m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pText2Device, + font_size, fill_color)) { return TRUE; } } @@ -843,8 +840,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, return FALSE; } else if (!(text_flags & FXTEXT_NO_NATIVETEXT)) { if (ShouldDrawDeviceText(pFont, text_flags) && - m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pCache, - pText2Device, font_size, fill_color)) { + m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pText2Device, + font_size, fill_color)) { return TRUE; } } @@ -862,9 +859,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, (pFont->GetSubstFont()->m_SubstFlags & FXFONT_SUBST_GLYPHPATH)) { int nPathFlags = (text_flags & FXTEXT_NOSMOOTH) == 0 ? 0 : FXFILL_NOPATHSMOOTH; - return DrawTextPath(nChars, pCharPos, pFont, pCache, font_size, - pText2Device, nullptr, nullptr, fill_color, 0, - nullptr, nPathFlags); + return DrawTextPath(nChars, pCharPos, pFont, font_size, pText2Device, + nullptr, nullptr, fill_color, 0, nullptr, nPathFlags); } } int anti_alias = FXFT_RENDER_MODE_MONO; @@ -895,10 +891,6 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, } } } - if (!pCache) - pCache = CFX_GEModule::Get()->GetFontCache(); - CFX_FaceCache* pFaceCache = pCache->GetCachedFace(pFont); - CFX_AutoFontCache autoFontCache(pCache, pFont); std::vector<FXTEXT_GLYPHPOS> glyphs(nChars); CFX_Matrix matrixCTM = GetCTM(); FX_FLOAT scale_x = FXSYS_fabs(matrixCTM.a); @@ -922,12 +914,12 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, charpos.m_AdjustMatrix[0], charpos.m_AdjustMatrix[1], charpos.m_AdjustMatrix[2], charpos.m_AdjustMatrix[3], 0, 0); new_matrix.Concat(deviceCtm); - glyph.m_pGlyph = pFaceCache->LoadGlyphBitmap( - pFont, charpos.m_GlyphIndex, charpos.m_bFontStyle, &new_matrix, + glyph.m_pGlyph = pFont->LoadGlyphBitmap( + charpos.m_GlyphIndex, charpos.m_bFontStyle, &new_matrix, charpos.m_FontCharWidth, anti_alias, nativetext_flags); } else { - glyph.m_pGlyph = pFaceCache->LoadGlyphBitmap( - pFont, charpos.m_GlyphIndex, charpos.m_bFontStyle, &deviceCtm, + glyph.m_pGlyph = pFont->LoadGlyphBitmap( + charpos.m_GlyphIndex, charpos.m_bFontStyle, &deviceCtm, charpos.m_FontCharWidth, anti_alias, nativetext_flags); } } @@ -1048,7 +1040,6 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, FX_BOOL CFX_RenderDevice::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, @@ -1057,10 +1048,6 @@ FX_BOOL CFX_RenderDevice::DrawTextPath(int nChars, FX_ARGB stroke_color, CFX_PathData* pClippingPath, int nFlag) { - if (!pCache) - pCache = CFX_GEModule::Get()->GetFontCache(); - CFX_FaceCache* pFaceCache = pCache->GetCachedFace(pFont); - CFX_AutoFontCache autoFontCache(pCache, pFont); for (int iChar = 0; iChar < nChars; iChar++) { const FXTEXT_CHARPOS& charpos = pCharPos[iChar]; CFX_Matrix matrix; @@ -1070,8 +1057,8 @@ FX_BOOL CFX_RenderDevice::DrawTextPath(int nChars, } matrix.Concat(font_size, 0, 0, font_size, charpos.m_OriginX, charpos.m_OriginY); - const CFX_PathData* pPath = pFaceCache->LoadGlyphPath( - pFont, charpos.m_GlyphIndex, charpos.m_FontCharWidth); + const CFX_PathData* pPath = + pFont->LoadGlyphPath(charpos.m_GlyphIndex, charpos.m_FontCharWidth); if (!pPath) continue; matrix.Concat(*pText2User); diff --git a/core/fxge/ifx_renderdevicedriver.cpp b/core/fxge/ifx_renderdevicedriver.cpp index 69b8ac903d..5acfae4b8b 100644 --- a/core/fxge/ifx_renderdevicedriver.cpp +++ b/core/fxge/ifx_renderdevicedriver.cpp @@ -10,8 +10,6 @@ #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" -class CFX_FontCache; - IFX_RenderDeviceDriver::~IFX_RenderDeviceDriver() {} CFX_Matrix IFX_RenderDeviceDriver::GetCTM() const { @@ -70,7 +68,6 @@ void IFX_RenderDeviceDriver::CancelDIBits(void* handle) {} FX_BOOL IFX_RenderDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) { 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 <map> +#include <memory> #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<FXFT_Face, CFX_CountedFaceCache*>; + 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>>; 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<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; @@ -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<CFX_SubstFont> m_pSubstFont; std::vector<uint8_t> 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); diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index d2e4abce92..b1c47bfedf 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -14,7 +14,6 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_graphstatedata.h" @@ -486,7 +485,6 @@ class SkiaState { // mark all cached state as uninitialized SkiaState() : m_pFont(nullptr), - m_pCache(nullptr), m_fontSize(0), m_fillColor(0), m_strokeColor(0), @@ -580,7 +578,6 @@ class SkiaState { bool DrawText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pMatrix, FX_FLOAT font_size, uint32_t color, @@ -591,13 +588,12 @@ class SkiaState { FlushCommands(pDriver); if (m_drawPath) FlushPath(pDriver); - if (m_drawText && FontChanged(pFont, pCache, pMatrix, font_size, color)) + if (m_drawText && FontChanged(pFont, pMatrix, font_size, color)) FlushText(pDriver); if (!m_drawText) { m_positions.setCount(0); m_glyphs.setCount(0); m_pFont = pFont; - m_pCache = pCache; m_fontSize = font_size; m_fillColor = color; m_drawMatrix = *pMatrix; @@ -626,8 +622,8 @@ class SkiaState { SkPaint skPaint; skPaint.setAntiAlias(true); skPaint.setColor(m_fillColor); - if (m_pFont->GetFace() && m_pCache) { // exclude placeholder test fonts - sk_sp<SkTypeface> typeface(SkSafeRef(m_pCache->GetDeviceCache(m_pFont))); + if (m_pFont->GetFace()) { // exclude placeholder test fonts + sk_sp<SkTypeface> typeface(SkSafeRef(m_pFont->GetDeviceCache())); skPaint.setTypeface(typeface); } skPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); @@ -783,13 +779,11 @@ class SkiaState { } bool FontChanged(CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pMatrix, FX_FLOAT font_size, uint32_t color) { - return pFont != m_pFont || pCache != m_pCache || - MatrixChanged(pMatrix, m_drawMatrix) || font_size != m_fontSize || - color != m_fillColor; + return pFont != m_pFont || MatrixChanged(pMatrix, m_drawMatrix) || + font_size != m_fontSize || color != m_fillColor; } bool MatrixChanged(const CFX_Matrix* pMatrix, const CFX_Matrix& refMatrix) { @@ -872,7 +866,6 @@ class SkiaState { CFX_GraphStateData m_drawState; CFX_Matrix m_clipMatrix; CFX_Font* m_pFont; - CFX_FontCache* m_pCache; FX_FLOAT m_fontSize; uint32_t m_fillColor; uint32_t m_strokeColor; @@ -1005,18 +998,14 @@ void CFX_SkiaDeviceDriver::Flush() { FX_BOOL CFX_SkiaDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) { - if (!pCache) - pCache = CFX_GEModule::Get()->GetFontCache(); - if (m_pCache->DrawText(nChars, pCharPos, pFont, pCache, pObject2Device, - font_size, color, this)) { + if (m_pCache->DrawText(nChars, pCharPos, pFont, pObject2Device, font_size, + color, this)) { return TRUE; } - sk_sp<SkTypeface> typeface( - SkSafeRef(pCache ? pCache->GetDeviceCache(pFont) : nullptr)); + sk_sp<SkTypeface> typeface(SkSafeRef(pFont->GetDeviceCache())); SkPaint paint; paint.setAntiAlias(true); paint.setColor(color); diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index 8a1bf690b2..78d8e32ebc 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -10,7 +10,6 @@ #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/ifx_renderdevicedriver.h" -class CFX_FontCache; class SkCanvas; class SkMatrix; class SkPaint; @@ -122,7 +121,6 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { 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) override; diff --git a/core/fxge/skia/fx_skia_device_unittest.cpp b/core/fxge/skia/fx_skia_device_unittest.cpp index 5162e9cbde..5666feea9f 100644 --- a/core/fxge/skia/fx_skia_device_unittest.cpp +++ b/core/fxge/skia/fx_skia_device_unittest.cpp @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" @@ -39,7 +38,6 @@ void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) { FXTEXT_CHARPOS charPos[] = {{{0, 0, 0, 0}, 0, 1, 1, 4, false, false}}; CFX_Font font; FX_FLOAT fontSize = 1; - CFX_FontCache cache; CFX_PathData clipPath, clipPath2; clipPath.AppendRect(0, 0, 3, 1); clipPath2.AppendRect(0, 0, 2, 1); @@ -59,8 +57,8 @@ void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) { driver->DrawPath(&path1, &matrix, &graphState, 0xFF112233, 0, FXFILL_WINDING, 0); } else if (state.m_graphic == State::Graphic::kText) { - driver->DrawDeviceText(SK_ARRAY_COUNT(charPos), charPos, &font, &cache, - &matrix, fontSize, 0xFF445566); + driver->DrawDeviceText(SK_ARRAY_COUNT(charPos), charPos, &font, &matrix, + fontSize, 0xFF445566); } if (state.m_save == State::Save::kYes) driver->RestoreState(true); @@ -82,8 +80,8 @@ void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) { driver->DrawPath(&path2, &matrix2, &graphState, 0xFF112233, 0, FXFILL_WINDING, 0); } else if (state.m_graphic == State::Graphic::kText) { - driver->DrawDeviceText(SK_ARRAY_COUNT(charPos), charPos, &font, &cache, - &matrix2, fontSize, 0xFF445566); + driver->DrawDeviceText(SK_ARRAY_COUNT(charPos), charPos, &font, &matrix2, + fontSize, 0xFF445566); } if (state.m_save == State::Save::kYes) driver->RestoreState(false); diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp index bc5bb92d5e..2a52a60ce6 100644 --- a/core/fxge/win32/fx_win32_print.cpp +++ b/core/fxge/win32/fx_win32_print.cpp @@ -14,7 +14,6 @@ #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/cfx_windowsdevice.h" #include "core/fxge/include/fx_freetype.h" @@ -199,7 +198,6 @@ FX_BOOL CGdiPrinterDriver::StartDIBits(const CFX_DIBSource* pSource, FX_BOOL CGdiPrinterDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) { diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h index 8c3443b3fd..7e35793675 100644 --- a/core/fxge/win32/win32_int.h +++ b/core/fxge/win32/win32_int.h @@ -11,7 +11,6 @@ #include "core/fxge/include/ifx_renderdevicedriver.h" #include "core/fxge/win32/dwrite_int.h" -class CFX_FontCache; struct FXTEXT_CHARPOS; struct WINDIB_Open_Args_; @@ -246,7 +245,6 @@ class CGdiPrinterDriver : public CGdiDeviceDriver { 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) override; |