From d8b5e73d8609b74e6a995ee1768d20d47bd4b089 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 13 Aug 2015 11:22:54 -0700 Subject: Allow external font-path configuration from pdfium_test. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1268323004 . --- core/src/fxge/ge/fx_ge.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/src/fxge/ge/fx_ge.cpp') diff --git a/core/src/fxge/ge/fx_ge.cpp b/core/src/fxge/ge/fx_ge.cpp index d37ed5c714..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,8 +25,8 @@ CFX_GEModule::~CFX_GEModule() { CFX_GEModule* CFX_GEModule::Get() { return g_pGEModule; } -void CFX_GEModule::Create() { - g_pGEModule = new CFX_GEModule; +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); -- cgit v1.2.3