summaryrefslogtreecommitdiff
path: root/core/fxge/ge/cfx_gemodule.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-05-11 14:36:10 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-05-11 19:10:43 +0000
commit830897a1774fb50d04b656d7bf70be321e133cf9 (patch)
treebd5473e87f1246c8bdc9c224342637160d70da55 /core/fxge/ge/cfx_gemodule.cpp
parentdbc3d3e1e0b28692c31f08f6b4c606577255078d (diff)
downloadpdfium-830897a1774fb50d04b656d7bf70be321e133cf9.tar.xz
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 <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxge/ge/cfx_gemodule.cpp')
-rw-r--r--core/fxge/ge/cfx_gemodule.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/core/fxge/ge/cfx_gemodule.cpp b/core/fxge/ge/cfx_gemodule.cpp
index 125758b6ad..2cd1e31144 100644
--- a/core/fxge/ge/cfx_gemodule.cpp
+++ b/core/fxge/ge/cfx_gemodule.cpp
@@ -6,6 +6,7 @@
#include "core/fxge/cfx_gemodule.h"
+#include "core/fxcodec/fx_codec.h"
#include "core/fxge/cfx_fontcache.h"
#include "core/fxge/cfx_fontmgr.h"
#include "core/fxge/ge/cfx_folderfontinfo.h"
@@ -19,9 +20,8 @@ CFX_GEModule* g_pGEModule = nullptr;
} // namespace
CFX_GEModule::CFX_GEModule()
- : m_FTLibrary(nullptr),
- m_pFontMgr(new CFX_FontMgr),
- m_pCodecModule(nullptr),
+ : m_pFontMgr(pdfium::MakeUnique<CFX_FontMgr>()),
+ m_pCodecModule(pdfium::MakeUnique<CCodec_ModuleMgr>()),
m_pPlatformData(nullptr),
m_pUserFontPaths(nullptr) {}
@@ -43,10 +43,8 @@ void CFX_GEModule::Destroy() {
g_pGEModule = nullptr;
}
-void CFX_GEModule::Init(const char** userFontPaths,
- CCodec_ModuleMgr* pCodecModule) {
+void CFX_GEModule::Init(const char** userFontPaths) {
ASSERT(g_pGEModule);
- m_pCodecModule = pCodecModule;
m_pUserFontPaths = userFontPaths;
InitPlatform();
SetTextGamma(2.2f);