diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-13 11:52:45 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-13 11:52:45 -0700 |
| commit | 9311163b564785a3a3ccdcb09bd3b7d0b2976d1a (patch) | |
| tree | a6bb01ee4e1f43ad6659baa1c24fac729bcd5033 /core/src/fxge/ge/fx_ge_linux.cpp | |
| parent | 98367f3ef7dc76c856db1c8a3721bef5f9b7adfc (diff) | |
| download | pdfium-9311163b564785a3a3ccdcb09bd3b7d0b2976d1a.tar.xz | |
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 .
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, 13 insertions, 6 deletions
diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/src/fxge/ge/fx_ge_linux.cpp index 299806ca07..8ff0a4e5b1 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(); + FX_BOOL ParseFontCfg(const char** pUserPaths); 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() { +IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUserPaths) { CFX_LinuxFontInfo* pInfo = new CFX_LinuxFontInfo; - if (!pInfo->ParseFontCfg()) { + if (!pInfo->ParseFontCfg(pUserPaths)) { pInfo->AddPath("/usr/share/fonts"); pInfo->AddPath("/usr/share/X11/fonts/Type1"); pInfo->AddPath("/usr/share/X11/fonts/TTF"); @@ -237,11 +237,18 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { } return pInfo; } -FX_BOOL CFX_LinuxFontInfo::ParseFontCfg() { - return FALSE; +FX_BOOL CFX_LinuxFontInfo::ParseFontCfg(const char** pUserPaths) { + if (!pUserPaths) { + return FALSE; + } + for (const char** pPath = pUserPaths; *pPath; ++pPath) { + AddPath(*pPath); + } + return TRUE; } void CFX_GEModule::InitPlatform() { - m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault()); + m_pFontMgr->SetSystemFontInfo( + IFX_SystemFontInfo::CreateDefault(m_pUserFontPaths)); } void CFX_GEModule::DestroyPlatform() {} #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ |