From 6f62d53b7650311afc490bfdaa48f5e8536b8b4e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 23 Sep 2015 15:31:44 -0700 Subject: 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 . --- core/include/fxge/fx_font.h | 2 +- core/include/fxge/fx_ge.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'core/include/fxge') diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 2d19db614f..3484196187 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -349,7 +349,7 @@ class CFX_FontMapper { class IFX_SystemFontInfo { public: - static IFX_SystemFontInfo* CreateDefault(); + static IFX_SystemFontInfo* CreateDefault(const char** pUserPaths); virtual void Release() = 0; virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper) = 0; diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h index 23be3648d1..4cfe622007 100644 --- a/core/include/fxge/fx_ge.h +++ b/core/include/fxge/fx_ge.h @@ -19,7 +19,7 @@ class CCodec_ModuleMgr; class CFX_GEModule { public: - static void Create(); + static void Create(const char** pUserFontPaths); static void Use(CFX_GEModule* pMgr); @@ -41,7 +41,7 @@ class CFX_GEModule { void* GetPlatformData() { return m_pPlatformData; } protected: - CFX_GEModule(); + explicit CFX_GEModule(const char** pUserFontPaths); ~CFX_GEModule(); void InitPlatform(); @@ -53,6 +53,7 @@ class CFX_GEModule { CFX_FontMgr* m_pFontMgr; CCodec_ModuleMgr* m_pCodecModule; void* m_pPlatformData; + const char** m_pUserFontPaths; }; typedef struct { FX_FLOAT m_PointX; -- cgit v1.2.3