From f1e7c461dfabbff6b65a072f24f6711b34159361 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 23 Jul 2015 13:36:00 -0700 Subject: Revert "FX_BOOL considered harmful, part 2." This reverts commit 320b2313d19869333ed453af546e61a9fc2b81c9. Reason for revert: build failure. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1255693002 . --- core/src/fxge/android/fx_android_font.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'core/src/fxge/android/fx_android_font.cpp') diff --git a/core/src/fxge/android/fx_android_font.cpp b/core/src/fxge/android/fx_android_font.cpp index 4f2bc15b2a..3e2fc45854 100644 --- a/core/src/fxge/android/fx_android_font.cpp +++ b/core/src/fxge/android/fx_android_font.cpp @@ -10,20 +10,20 @@ CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(NULL) { } -bool CFX_AndroidFontInfo::Init(IFPF_FontMgr *pFontMgr) +FX_BOOL CFX_AndroidFontInfo::Init(IFPF_FontMgr *pFontMgr) { if (!pFontMgr) { - return false; + return FALSE; } pFontMgr->LoadSystemFonts(); m_pFontMgr = pFontMgr; - return true; + return TRUE; } -bool CFX_AndroidFontInfo::EnumFontList(CFX_FontMapper* pMapper) +FX_BOOL CFX_AndroidFontInfo::EnumFontList(CFX_FontMapper* pMapper) { - return false; + return FALSE; } -void* CFX_AndroidFontInfo::MapFont(int weight, bool bItalic, int charset, int pitch_family, const FX_CHAR* face, bool& bExact) +void* CFX_AndroidFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact) { if (!m_pFontMgr) { return NULL; @@ -57,21 +57,21 @@ FX_DWORD CFX_AndroidFontInfo::GetFontData(void* hFont, FX_DWORD table, uint8_t* } return ((IFPF_Font*)hFont)->GetFontData(table, buffer, size); } -bool CFX_AndroidFontInfo::GetFaceName(void* hFont, CFX_ByteString& name) +FX_BOOL CFX_AndroidFontInfo::GetFaceName(void* hFont, CFX_ByteString& name) { if (!hFont) { - return false; + return FALSE; } name = ((IFPF_Font*)hFont)->GetFamilyName(); - return true; + return TRUE; } -bool CFX_AndroidFontInfo::GetFontCharset(void* hFont, int& charset) +FX_BOOL CFX_AndroidFontInfo::GetFontCharset(void* hFont, int& charset) { if (!hFont) { - return false; + return FALSE; } charset = ((IFPF_Font*)hFont)->GetCharset(); - return false; + return FALSE; } void CFX_AndroidFontInfo::DeleteFont(void* hFont) { -- cgit v1.2.3