diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
| commit | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (patch) | |
| tree | 0a0d92713af476897899b126d180cc6294433d10 /core/src/fxge/android/fpf_skiafontmgr.h | |
| parent | aafeff816e22c1333c17d8a0eb4fe8927c28142d (diff) | |
| download | pdfium-ff46aaf499edcf153ee2f57c7016587aa96dcfa0.tar.xz | |
FX Bool considered harmful, part 3
Try to reland this patch after fixing underlying issues that
caused it to be reverted.
fx_system.h is the only manual edit.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1258093002 .
Diffstat (limited to 'core/src/fxge/android/fpf_skiafontmgr.h')
| -rw-r--r-- | core/src/fxge/android/fpf_skiafontmgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h index 8c721ff68a..b4ebe9454a 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.h +++ b/core/src/fxge/android/fpf_skiafontmgr.h @@ -94,7 +94,7 @@ class CFPF_SkiaFontMgr : public IFPF_FontMgr public: CFPF_SkiaFontMgr(); virtual ~CFPF_SkiaFontMgr(); - FX_BOOL InitFTLibrary(); + bool InitFTLibrary(); virtual void LoadSystemFonts(); virtual void LoadPrivateFont(IFX_FileRead* pFontFile); virtual void LoadPrivateFont(const CFX_ByteStringC& bsFileName); @@ -109,7 +109,7 @@ protected: void ScanFile(const CFX_ByteStringC& file); void ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor *pFontDesc); void OutputSystemFonts(); - FX_BOOL m_bLoaded; + bool m_bLoaded; CFX_PtrArray m_FontFaces; FXFT_Library m_FTLibrary; CFX_MapPtrToPtr m_FamilyFonts; |