From 6f62d53b7650311afc490bfdaa48f5e8536b8b4e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 23 Sep 2015 15:31:44 -0700 Subject: 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 . --- core/src/fxge/win32/fx_win32_device.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fxge/win32') diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index d5f29686c9..a0ccb83ae4 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -405,7 +405,7 @@ FX_BOOL CFX_Win32FontInfo::GetFontCharset(void* hFont, int& charset) { charset = tm.tmCharSet; return TRUE; } -IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { +IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { return new CFX_Win32FontInfo; } void CFX_GEModule::InitPlatform() { @@ -419,7 +419,7 @@ void CFX_GEModule::InitPlatform() { pPlatformData->m_bHalfTone = ver.dwMajorVersion >= 5; pPlatformData->m_GdiplusExt.Load(); m_pPlatformData = pPlatformData; - m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault()); + m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault(nullptr)); } void CFX_GEModule::DestroyPlatform() { delete (CWin32Platform*)m_pPlatformData; -- cgit v1.2.3