diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-09-23 15:31:44 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-09-23 15:31:44 -0700 |
| commit | 6f62d53b7650311afc490bfdaa48f5e8536b8b4e (patch) | |
| tree | 9b1e1cc17f3d75d6f9bd2413281d5b29450f1fcd /core/src/fxge/ge/fx_ge.cpp | |
| parent | 5377ebf967ea860eec4b3cfa3877ed30b84509dc (diff) | |
| download | pdfium-6f62d53b7650311afc490bfdaa48f5e8536b8b4e.tar.xz | |
Merge to XFA: Allow external font-path configuration from pdfium_test.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1268323004 .
(cherry picked from commit 9311163b564785a3a3ccdcb09bd3b7d0b2976d1a)
Review URL: https://codereview.chromium.org/1368513002 .
Diffstat (limited to 'core/src/fxge/ge/fx_ge.cpp')
| -rw-r--r-- | core/src/fxge/ge/fx_ge.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/src/fxge/ge/fx_ge.cpp b/core/src/fxge/ge/fx_ge.cpp index 607c9ee559..6dfed8837c 100644 --- a/core/src/fxge/ge/fx_ge.cpp +++ b/core/src/fxge/ge/fx_ge.cpp @@ -7,12 +7,13 @@ #include "../../../include/fxge/fx_ge.h" #include "text_int.h" static CFX_GEModule* g_pGEModule = NULL; -CFX_GEModule::CFX_GEModule() { +CFX_GEModule::CFX_GEModule(const char** pUserFontPaths) { m_pFontCache = NULL; m_pFontMgr = NULL; m_FTLibrary = NULL; m_pCodecModule = NULL; m_pPlatformData = NULL; + m_pUserFontPaths = pUserFontPaths; } CFX_GEModule::~CFX_GEModule() { delete m_pFontCache; @@ -24,11 +25,8 @@ CFX_GEModule::~CFX_GEModule() { CFX_GEModule* CFX_GEModule::Get() { return g_pGEModule; } -void CFX_GEModule::Create() { - g_pGEModule = new CFX_GEModule; - if (!g_pGEModule) { - return; - } +void CFX_GEModule::Create(const char** userFontPaths) { + g_pGEModule = new CFX_GEModule(userFontPaths); g_pGEModule->m_pFontMgr = new CFX_FontMgr; g_pGEModule->InitPlatform(); g_pGEModule->SetTextGamma(2.2f); |