diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-28 15:59:42 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-28 20:40:36 +0000 |
| commit | 10e1f05a9e644cd954792bcd40ef787551cbd209 (patch) | |
| tree | d203254a0a2c856a9b8ba5a0445a883c7072dd77 /core/fxge/apple | |
| parent | dd0e6e1eba14c76dedd4b4e55ab47406856c9a76 (diff) | |
| download | pdfium-10e1f05a9e644cd954792bcd40ef787551cbd209.tar.xz | |
Cleanup font defines
Use methods to match font information; cleanup some font code.
Change-Id: Ib99c1e466e56723cb5d264d49e1caf9bbbc0daed
Reviewed-on: https://pdfium-review.googlesource.com/15072
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/apple')
| -rw-r--r-- | core/fxge/apple/fx_mac_imp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp index 637984797a..324f0200b9 100644 --- a/core/fxge/apple/fx_mac_imp.cpp +++ b/core/fxge/apple/fx_mac_imp.cpp @@ -56,8 +56,8 @@ void GetJapanesePreference(ByteString* face, int weight, int pitch_family) { *face = JAPAN_GOTHIC; return; } - *face = ((pitch_family & FXFONT_FF_ROMAN) || weight <= 400) ? JAPAN_MINCHO - : JAPAN_GOTHIC; + *face = (FontFamilyIsRoman(pitch_family) || weight <= 400) ? JAPAN_MINCHO + : JAPAN_GOTHIC; } void* CFX_MacFontInfo::MapFont(int weight, @@ -97,7 +97,7 @@ void* CFX_MacFontInfo::MapFont(int weight, if (it != m_FontList.end()) return it->second.get(); - if (charset == FX_CHARSET_ANSI && (pitch_family & FXFONT_FF_FIXEDPITCH)) + if (charset == FX_CHARSET_ANSI && FontFamilyIsFixedPitch(pitch_family)) return GetFont("Courier New"); if (charset == FX_CHARSET_ANSI || charset == FX_CHARSET_Symbol) |