diff options
author | art-snake <art-snake@yandex-team.ru> | 2016-09-20 07:46:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-20 07:46:26 -0700 |
commit | 9972ff99285cea12a20026136e98c1e635a15010 (patch) | |
tree | 7ddd9c0a49329baccd0e570fe064527b794c1fde /core/fpdfapi/fpdf_render/fpdf_render.cpp | |
parent | 717d1330bafb846e4cd25bfb4952bfdedce0db91 (diff) | |
download | pdfium-9972ff99285cea12a20026136e98c1e635a15010.tar.xz |
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
Diffstat (limited to 'core/fpdfapi/fpdf_render/fpdf_render.cpp')
-rw-r--r-- | core/fpdfapi/fpdf_render/fpdf_render.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
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) { |