From 830897a1774fb50d04b656d7bf70be321e133cf9 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 11 May 2017 14:36:10 -0400 Subject: Move map and codec loading into manager This Cl consolidates the code to load maps and codecs into the CPDF_ModuleMgr class instead of putting it directly into fpdfview. Change-Id: Ia08f212f43a33e51ab1c7832051ee4f28eecb50d Reviewed-on: https://pdfium-review.googlesource.com/5335 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- core/fxge/cfx_gemodule.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'core/fxge/cfx_gemodule.h') diff --git a/core/fxge/cfx_gemodule.h b/core/fxge/cfx_gemodule.h index 4dfa413437..e51ddde967 100644 --- a/core/fxge/cfx_gemodule.h +++ b/core/fxge/cfx_gemodule.h @@ -21,17 +21,15 @@ class CFX_GEModule { static CFX_GEModule* Get(); static void Destroy(); - void Init(const char** pUserFontPaths, CCodec_ModuleMgr* pCodecModule); + void Init(const char** pUserFontPaths); CFX_FontCache* GetFontCache(); CFX_FontMgr* GetFontMgr() { return m_pFontMgr.get(); } void SetTextGamma(float gammaValue); const uint8_t* GetTextGammaTable() const; - CCodec_ModuleMgr* GetCodecModule() { return m_pCodecModule; } + CCodec_ModuleMgr* GetCodecModule() { return m_pCodecModule.get(); } void* GetPlatformData() { return m_pPlatformData; } - FXFT_Library m_FTLibrary; - private: CFX_GEModule(); ~CFX_GEModule(); @@ -42,7 +40,7 @@ class CFX_GEModule { uint8_t m_GammaValue[256]; std::unique_ptr m_pFontCache; std::unique_ptr m_pFontMgr; - CCodec_ModuleMgr* m_pCodecModule; + std::unique_ptr m_pCodecModule; void* m_pPlatformData; const char** m_pUserFontPaths; }; -- cgit v1.2.3