summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi')
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_doc.cpp21
-rw-r--r--core/fpdfapi/fpdf_parser/cpdf_document.cpp1
-rw-r--r--core/fpdfapi/fpdf_render/fpdf_render.cpp12
-rw-r--r--core/fpdfapi/fpdf_render/fpdf_render_text.cpp38
-rw-r--r--core/fpdfapi/fpdf_render/render_int.h3
5 files changed, 23 insertions, 52 deletions
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
index 9e586e326f..f83d6fa613 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
@@ -214,9 +214,10 @@ void CPDF_DocPageData::ReleaseFont(const CPDF_Dictionary* pFontDict) {
return;
pFontData->RemoveRef();
- if (pFontData->use_count() != 0)
+ if (pFontData->use_count() > 1)
return;
+ // We have font data only in m_FontMap cache. Clean it.
pFontData->clear();
}
@@ -330,9 +331,10 @@ void CPDF_DocPageData::ReleaseColorSpace(const CPDF_Object* pColorSpace) {
return;
pCountedColorSpace->RemoveRef();
- if (pCountedColorSpace->use_count() != 0)
+ if (pCountedColorSpace->use_count() > 1)
return;
+ // We have item only in m_ColorSpaceMap cache. Clean it.
pCountedColorSpace->get()->ReleaseCS();
pCountedColorSpace->reset(nullptr);
}
@@ -391,9 +393,10 @@ void CPDF_DocPageData::ReleasePattern(const CPDF_Object* pPatternObj) {
return;
pPattern->RemoveRef();
- if (pPattern->use_count() != 0)
+ if (pPattern->use_count() > 1)
return;
+ // We have item only in m_PatternMap cache. Clean it.
pPattern->clear();
}
@@ -429,9 +432,10 @@ void CPDF_DocPageData::ReleaseImage(const CPDF_Object* pImageStream) {
return;
pCountedImage->RemoveRef();
- if (pCountedImage->use_count() != 0)
+ if (pCountedImage->use_count() > 1)
return;
+ // We have item only in m_ImageMap cache. Clean it.
delete pCountedImage->get();
delete pCountedImage;
m_ImageMap.erase(it);
@@ -454,7 +458,8 @@ CPDF_IccProfile* CPDF_DocPageData::GetIccProfile(
auto hash_it = m_HashProfileMap.find(bsDigest);
if (hash_it != m_HashProfileMap.end()) {
auto it_copied_stream = m_IccProfileMap.find(hash_it->second);
- return it_copied_stream->second->AddRef();
+ if (it_copied_stream != m_IccProfileMap.end())
+ return it_copied_stream->second->AddRef();
}
CPDF_IccProfile* pProfile =
new CPDF_IccProfile(stream.GetData(), stream.GetSize());
@@ -473,7 +478,8 @@ void CPDF_DocPageData::ReleaseIccProfile(const CPDF_IccProfile* pIccProfile) {
continue;
profile->RemoveRef();
- if (profile->use_count() == 0) {
+ if (profile->use_count() == 1) {
+ // We have item only in m_IccProfileMap cache. Clean it.
delete profile->get();
delete profile;
m_IccProfileMap.erase(it);
@@ -518,9 +524,10 @@ void CPDF_DocPageData::ReleaseFontFileStreamAcc(
return;
pCountedStream->RemoveRef();
- if (pCountedStream->use_count() != 0)
+ if (pCountedStream->use_count() > 1)
return;
+ // We have item only in m_FontFileMap cache. Clean it.
delete pCountedStream->get();
delete pCountedStream;
m_FontFileMap.erase(it);
diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
index 9f5a4299e9..6b58aea59f 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;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 19:24:44 +0000