From 9311163b564785a3a3ccdcb09bd3b7d0b2976d1a Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Thu, 13 Aug 2015 11:52:45 -0700
Subject: Allow external font-path configuration from pdfium_test.

R=thestig@chromium.org

Committed: https://pdfium.googlesource.com/pdfium/+/d8b5e73d8609b74e6a995ee1768d20d47bd4b089

Review URL: https://codereview.chromium.org/1268323004 .
---
 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')

diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index aa9286ff3e..5cd16207e6 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -285,7 +285,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 0aa3f17d4d..ef3c8f665e 100644
--- a/core/include/fxge/fx_ge.h
+++ b/core/include/fxge/fx_ge.h
@@ -24,7 +24,7 @@ class IFXG_PaintModuleMgr;
 
 class CFX_GEModule {
  public:
-  static void Create();
+  static void Create(const char** pUserFontPaths);
 
   static void Use(CFX_GEModule* pMgr);
 
@@ -46,7 +46,7 @@ class CFX_GEModule {
   void* GetPlatformData() { return m_pPlatformData; }
 
  protected:
-  CFX_GEModule();
+  explicit CFX_GEModule(const char** pUserFontPaths);
 
   ~CFX_GEModule();
   void InitPlatform();
@@ -58,6 +58,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