summaryrefslogtreecommitdiff
path: root/xfa/fgas/font/cfgas_defaultfontmanager.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-26 11:09:35 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-26 15:21:44 +0000
commit1a43b3064dc38a55de4b1d727237806578bb3ef9 (patch)
tree66c790a154b68fdd6ea63c0bb4cabc0fac0badf4 /xfa/fgas/font/cfgas_defaultfontmanager.cpp
parenta7caeb52912150e59aadf49ed21a45a4a1260a4a (diff)
downloadpdfium-1a43b3064dc38a55de4b1d727237806578bb3ef9.tar.xz
Remove font default params
This CL removes some default parameters from the font code. Change-Id: If6f6e09c93474e1e8b7ffaae53eb37dd40c32fab Reviewed-on: https://pdfium-review.googlesource.com/14815 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/font/cfgas_defaultfontmanager.cpp')
-rw-r--r--xfa/fgas/font/cfgas_defaultfontmanager.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/xfa/fgas/font/cfgas_defaultfontmanager.cpp b/xfa/fgas/font/cfgas_defaultfontmanager.cpp
index d3864be16a..4b9091f690 100644
--- a/xfa/fgas/font/cfgas_defaultfontmanager.cpp
+++ b/xfa/fgas/font/cfgas_defaultfontmanager.cpp
@@ -15,11 +15,10 @@ CFGAS_DefaultFontManager::~CFGAS_DefaultFontManager() {}
RetainPtr<CFGAS_GEFont> CFGAS_DefaultFontManager::GetFont(
CFGAS_FontMgr* pFontMgr,
const WideStringView& wsFontFamily,
- uint32_t dwFontStyles,
- uint16_t wCodePage) {
+ uint32_t dwFontStyles) {
WideString wsFontName(wsFontFamily);
RetainPtr<CFGAS_GEFont> pFont =
- pFontMgr->LoadFont(wsFontName.c_str(), dwFontStyles, wCodePage);
+ pFontMgr->LoadFont(wsFontName.c_str(), dwFontStyles, 0xFFFF);
if (!pFont) {
const FGAS_FontInfo* pCurFont =
FGAS_FontInfoByFontName(wsFontName.AsStringView());
@@ -39,7 +38,7 @@ RetainPtr<CFGAS_GEFont> CFGAS_DefaultFontManager::GetFont(
iLength--;
}
WideString wsReplace = WideString(pReplace, pNameText - pReplace);
- pFont = pFontMgr->LoadFont(wsReplace.c_str(), dwStyle, wCodePage);
+ pFont = pFontMgr->LoadFont(wsReplace.c_str(), dwStyle, 0xFFFF);
if (pFont)
break;
@@ -57,13 +56,12 @@ RetainPtr<CFGAS_GEFont> CFGAS_DefaultFontManager::GetFont(
RetainPtr<CFGAS_GEFont> CFGAS_DefaultFontManager::GetDefaultFont(
CFGAS_FontMgr* pFontMgr,
const WideStringView& wsFontFamily,
- uint32_t dwFontStyles,
- uint16_t wCodePage) {
+ uint32_t dwFontStyles) {
RetainPtr<CFGAS_GEFont> pFont =
- pFontMgr->LoadFont(L"Arial Narrow", dwFontStyles, wCodePage);
+ pFontMgr->LoadFont(L"Arial Narrow", dwFontStyles, 0xFFFF);
if (!pFont) {
pFont = pFontMgr->LoadFont(static_cast<const wchar_t*>(nullptr),
- dwFontStyles, wCodePage);
+ dwFontStyles, 0xFFFF);
}
if (pFont)
m_CacheFonts.push_back(pFont);