diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-28 11:51:24 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-28 20:39:56 +0000 |
| commit | dd0e6e1eba14c76dedd4b4e55ab47406856c9a76 (patch) | |
| tree | 36f27e3ec86b5c376d51bcd753cbdfbe3402e6c7 /xfa/fgas/font/cfgas_defaultfontmanager.cpp | |
| parent | 58418a24debb15019ec71eca193eff02c2a4846c (diff) | |
| download | pdfium-dd0e6e1eba14c76dedd4b4e55ab47406856c9a76.tar.xz | |
Cleanup font defines
This CL removes duplicate defines between XFA and core. Several OR'd
values have been coverted into individual booleans to make the code
clearer.
Change-Id: Ic32a71c711cffd9a0cf1136e5a22f0502e085c39
Reviewed-on: https://pdfium-review.googlesource.com/15071
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.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fgas/font/cfgas_defaultfontmanager.cpp b/xfa/fgas/font/cfgas_defaultfontmanager.cpp index 6f39797927..322d06b384 100644 --- a/xfa/fgas/font/cfgas_defaultfontmanager.cpp +++ b/xfa/fgas/font/cfgas_defaultfontmanager.cpp @@ -24,10 +24,11 @@ RetainPtr<CFGAS_GEFont> CFGAS_DefaultFontManager::GetFont( FGAS_FontInfoByFontName(wsFontName.AsStringView()); if (pCurFont && pCurFont->pReplaceFont) { uint32_t dwStyle = 0; - if (dwFontStyles & FX_FONTSTYLE_Bold) - dwStyle |= FX_FONTSTYLE_Bold; - if (dwFontStyles & FX_FONTSTYLE_Italic) - dwStyle |= FX_FONTSTYLE_Italic; + // TODO(dsinclair): Why doesn't this check the other flags? + if (dwFontStyles & FXFONT_BOLD) + dwStyle |= FXFONT_BOLD; + if (dwFontStyles & FXFONT_ITALIC) + dwStyle |= FXFONT_ITALIC; const wchar_t* pReplace = pCurFont->pReplaceFont; int32_t iLength = wcslen(pReplace); |