diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-09-23 15:31:44 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-09-23 15:31:44 -0700 |
| commit | 6f62d53b7650311afc490bfdaa48f5e8536b8b4e (patch) | |
| tree | 9b1e1cc17f3d75d6f9bd2413281d5b29450f1fcd /core/src/fxge/apple | |
| parent | 5377ebf967ea860eec4b3cfa3877ed30b84509dc (diff) | |
| download | pdfium-6f62d53b7650311afc490bfdaa48f5e8536b8b4e.tar.xz | |
Merge to XFA: Allow external font-path configuration from pdfium_test.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1268323004 .
(cherry picked from commit 9311163b564785a3a3ccdcb09bd3b7d0b2976d1a)
Review URL: https://codereview.chromium.org/1368513002 .
Diffstat (limited to 'core/src/fxge/apple')
| -rw-r--r-- | core/src/fxge/apple/fx_mac_imp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp index 88a51bd78c..07e3d02c4c 100644 --- a/core/src/fxge/apple/fx_mac_imp.cpp +++ b/core/src/fxge/apple/fx_mac_imp.cpp @@ -94,7 +94,7 @@ void* CFX_MacFontInfo::MapFont(int weight, return NULL; } -IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { +IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { CFX_MacFontInfo* pInfo = new CFX_MacFontInfo; if (!pInfo) { return NULL; @@ -106,7 +106,7 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { } void CFX_GEModule::InitPlatform() { m_pPlatformData = new CApplePlatform; - m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault()); + m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault(nullptr)); } void CFX_GEModule::DestroyPlatform() { delete (CApplePlatform*)m_pPlatformData; |