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/ge/text_int.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/ge/text_int.h')
| -rw-r--r-- | core/src/fxge/ge/text_int.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h index 12fac6a60a..2e861baf1b 100644 --- a/core/src/fxge/ge/text_int.h +++ b/core/src/fxge/ge/text_int.h @@ -32,12 +32,12 @@ public: m_RefCount = 0; } ~CTTFontDesc(); - FX_BOOL ReleaseFace(FXFT_Face face); + bool ReleaseFace(FXFT_Face face); int m_Type; union { struct { - FX_BOOL m_bItalic; - FX_BOOL m_bBold; + bool m_bItalic; + bool m_bBold; FXFT_Face m_pFace; } m_SingleFace; struct { @@ -63,9 +63,9 @@ private: { return Unicode; } - virtual FX_BOOL IsUnicodeCompatible() const + virtual bool IsUnicodeCompatible() const { - return TRUE; + return true; } }; #define CHARSET_FLAG_ANSI 1 @@ -97,7 +97,7 @@ public: FX_DWORD m_FileSize; FX_DWORD m_FontOffset; int m_Weight; - FX_BOOL m_bItalic; + bool m_bItalic; int m_PitchFamily; CFX_ByteString m_FontTables; }; |