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/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 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