From 8d2aae7ee320da3a8ffe01c57e38b3f98443257d Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 12:08:12 -0700 Subject: Revert "FX Bool considered harmful, part 3" This reverts commit ff46aaf499edcf153ee2f57c7016587aa96dcfa0. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1255293002 . --- core/src/fxge/android/fx_android_font.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/src/fxge/android/fx_android_font.h') diff --git a/core/src/fxge/android/fx_android_font.h b/core/src/fxge/android/fx_android_font.h index 075b79e7f2..83c04a03a4 100644 --- a/core/src/fxge/android/fx_android_font.h +++ b/core/src/fxge/android/fx_android_font.h @@ -18,18 +18,18 @@ public: delete this; } - virtual bool EnumFontList(CFX_FontMapper* pMapper); + virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper); - virtual void* MapFont(int weight, bool bItalic, int charset, int pitch_family, const FX_CHAR* face, bool& bExact); + virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact); virtual void* GetFont(const FX_CHAR* face); virtual FX_DWORD GetFontData(void* hFont, FX_DWORD table, uint8_t* buffer, FX_DWORD size); - virtual bool GetFaceName(void* hFont, CFX_ByteString& name); - virtual bool GetFontCharset(void* hFont, int& charset); + virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name); + virtual FX_BOOL GetFontCharset(void* hFont, int& charset); virtual void DeleteFont(void* hFont); virtual void* RetainFont(void* hFont); - bool Init(IFPF_FontMgr *pFontMgr); + FX_BOOL Init(IFPF_FontMgr *pFontMgr); protected: IFPF_FontMgr *m_pFontMgr; }; -- cgit v1.2.3