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 ++--- core/src/fxge/apple/fx_mac_imp.cpp | 4 ++-- core/src/fxge/ge/fx_ge.cpp | 7 +++---- core/src/fxge/ge/fx_ge_fontmap.cpp | 2 +- core/src/fxge/ge/fx_ge_linux.cpp | 19 ++++++------------- core/src/fxge/win32/fx_win32_device.cpp | 4 ++-- 7 files changed, 17 insertions(+), 26 deletions(-) (limited to 'core') 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; diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp index 5a4e6603df..9918ba97e8 100644 --- a/core/src/fxge/apple/fx_mac_imp.cpp +++ b/core/src/fxge/apple/fx_mac_imp.cpp @@ -93,7 +93,7 @@ void* CFX_MacFontInfo::MapFont(int weight, } return NULL; } -IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { +IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { CFX_MacFontInfo* pInfo = new CFX_MacFontInfo; pInfo->AddPath("~/Library/Fonts"); pInfo->AddPath("/Library/Fonts"); @@ -102,7 +102,7 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { } void CFX_GEModule::InitPlatform() { m_pPlatformData = new CApplePlatform; - m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault(nullptr)); + m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault()); } void CFX_GEModule::DestroyPlatform() { delete (CApplePlatform*)m_pPlatformData; diff --git a/core/src/fxge/ge/fx_ge.cpp b/core/src/fxge/ge/fx_ge.cpp index 6dfed8837c..d37ed5c714 100644 --- a/core/src/fxge/ge/fx_ge.cpp +++ b/core/src/fxge/ge/fx_ge.cpp @@ -7,13 +7,12 @@ #include "../../../include/fxge/fx_ge.h" #include "text_int.h" static CFX_GEModule* g_pGEModule = NULL; -CFX_GEModule::CFX_GEModule(const char** pUserFontPaths) { +CFX_GEModule::CFX_GEModule() { 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; @@ -25,8 +24,8 @@ CFX_GEModule::~CFX_GEModule() { CFX_GEModule* CFX_GEModule::Get() { return g_pGEModule; } -void CFX_GEModule::Create(const char** userFontPaths) { - g_pGEModule = new CFX_GEModule(userFontPaths); +void CFX_GEModule::Create() { + g_pGEModule = new CFX_GEModule; g_pGEModule->m_pFontMgr = new CFX_FontMgr; g_pGEModule->InitPlatform(); g_pGEModule->SetTextGamma(2.2f); diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index d4416d9487..02af775a31 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1270,7 +1270,7 @@ extern FX_BOOL _LoadFile(FXFT_Library library, IFX_FileRead* pFile, FXFT_Stream* stream); #if _FX_OS_ == _FX_ANDROID_ -IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { +IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { return NULL; } #endif diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/src/fxge/ge/fx_ge_linux.cpp index 8ff0a4e5b1..299806ca07 100644 --- a/core/src/fxge/ge/fx_ge_linux.cpp +++ b/core/src/fxge/ge/fx_ge_linux.cpp @@ -34,7 +34,7 @@ class CFX_LinuxFontInfo : public CFX_FolderFontInfo { int pitch_family, const FX_CHAR* family, int& iExact) override; - FX_BOOL ParseFontCfg(const char** pUserPaths); + FX_BOOL ParseFontCfg(); void* FindFont(int weight, FX_BOOL bItalic, int charset, @@ -227,9 +227,9 @@ void* CFX_LinuxFontInfo::FindFont(int weight, } return pFind; } -IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUserPaths) { +IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { CFX_LinuxFontInfo* pInfo = new CFX_LinuxFontInfo; - if (!pInfo->ParseFontCfg(pUserPaths)) { + if (!pInfo->ParseFontCfg()) { pInfo->AddPath("/usr/share/fonts"); pInfo->AddPath("/usr/share/X11/fonts/Type1"); pInfo->AddPath("/usr/share/X11/fonts/TTF"); @@ -237,18 +237,11 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUserPaths) { } return pInfo; } -FX_BOOL CFX_LinuxFontInfo::ParseFontCfg(const char** pUserPaths) { - if (!pUserPaths) { - return FALSE; - } - for (const char** pPath = pUserPaths; *pPath; ++pPath) { - AddPath(*pPath); - } - return TRUE; +FX_BOOL CFX_LinuxFontInfo::ParseFontCfg() { + return FALSE; } void CFX_GEModule::InitPlatform() { - m_pFontMgr->SetSystemFontInfo( - IFX_SystemFontInfo::CreateDefault(m_pUserFontPaths)); + m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault()); } void CFX_GEModule::DestroyPlatform() {} #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index c3325ba738..4cfc6cbf82 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -401,7 +401,7 @@ FX_BOOL CFX_Win32FontInfo::GetFontCharset(void* hFont, int& charset) { charset = tm.tmCharSet; return TRUE; } -IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { +IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { return new CFX_Win32FontInfo; } void CFX_GEModule::InitPlatform() { @@ -412,7 +412,7 @@ void CFX_GEModule::InitPlatform() { pPlatformData->m_bHalfTone = ver.dwMajorVersion >= 5; pPlatformData->m_GdiplusExt.Load(); m_pPlatformData = pPlatformData; - m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault(nullptr)); + m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault()); } void CFX_GEModule::DestroyPlatform() { delete (CWin32Platform*)m_pPlatformData; -- cgit v1.2.3