diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-08-13 11:32:36 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-08-13 11:32:36 -0700 |
commit | 98367f3ef7dc76c856db1c8a3721bef5f9b7adfc (patch) | |
tree | b0f9533e42d1d2383bc3667db84095b53a971ac8 /core/src/fxge/ge/fx_ge_linux.cpp | |
parent | d8b5e73d8609b74e6a995ee1768d20d47bd4b089 (diff) | |
download | pdfium-98367f3ef7dc76c856db1c8a3721bef5f9b7adfc.tar.xz |
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 .
Diffstat (limited to 'core/src/fxge/ge/fx_ge_linux.cpp')
-rw-r--r-- | core/src/fxge/ge/fx_ge_linux.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
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_ |