From 98367f3ef7dc76c856db1c8a3721bef5f9b7adfc Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 13 Aug 2015 11:32:36 -0700 Subject: Revert "Allow external font-path configuration from pdfium_test." This reverts commit d8b5e73d8609b74e6a995ee1768d20d47bd4b089. Broke corpus tests TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1292153002 . --- core/include/fxge/fx_font.h | 2 +- core/include/fxge/fx_ge.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'core/include/fxge') diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 5cd16207e6..aa9286ff3e 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(const char** pUserPaths); + static IFX_SystemFontInfo* CreateDefault(); 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 ef3c8f665e..0aa3f17d4d 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(const char** pUserFontPaths); + static void Create(); static void Use(CFX_GEModule* pMgr); @@ -46,7 +46,7 @@ class CFX_GEModule { void* GetPlatformData() { return m_pPlatformData; } protected: - explicit CFX_GEModule(const char** pUserFontPaths); + CFX_GEModule(); ~CFX_GEModule(); void InitPlatform(); @@ -58,7 +58,6 @@ 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