FX Bool considered harmful, part 3

core/src/fxge/android/fpf_skiafont.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fx_fpf.h"
 #if _FX_OS_ == _FX_ANDROID_
 #include "fpf_skiafont.h"
 #include "fpf_skiafontmgr.h"
@@ skipping 69 matching lines @@
     }
     return FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Face_Ascender(m_Face));
 }
 int32_t CFPF_SkiaFont::GetDescent() const
 {
     if (!m_Face) {
         return 0;
     }
     return FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Face_Descender(m_Face));
 }
-FX_BOOL CFPF_SkiaFont::GetGlyphBBox(int32_t iGlyphIndex, FX_RECT &rtBBox)
+bool CFPF_SkiaFont::GetGlyphBBox(int32_t iGlyphIndex, FX_RECT &rtBBox)
 {
     if (!m_Face) {
-        return FALSE;
+        return false;
     }
     if (FXFT_Is_Face_Tricky(m_Face)) {
         if (FXFT_Set_Char_Size(m_Face, 0, 1000 * 64, 72, 72)) {
-            return FALSE;
+            return false;
         }
         if (FXFT_Load_Glyph(m_Face, iGlyphIndex, FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH)) {
             FXFT_Set_Pixel_Sizes(m_Face, 0, 64);
-            return FALSE;
+            return false;
         }
         FXFT_Glyph glyph;
         if (FXFT_Get_Glyph(m_Face->glyph, &glyph)) {
             FXFT_Set_Pixel_Sizes(m_Face, 0, 64);
-            return FALSE;
+            return false;
         }
         FXFT_BBox cbox;
         FXFT_Glyph_Get_CBox(glyph, FXFT_GLYPH_BBOX_PIXELS, &cbox);
         int32_t x_ppem = m_Face->size->metrics.x_ppem;
         int32_t y_ppem = m_Face->size->metrics.y_ppem;
         rtBBox.left = FPF_EM_ADJUST(x_ppem, cbox.xMin);
         rtBBox.right = FPF_EM_ADJUST(x_ppem, cbox.xMax);
         rtBBox.top = FPF_EM_ADJUST(y_ppem, cbox.yMax);
         rtBBox.bottom = FPF_EM_ADJUST(y_ppem, cbox.yMin);
         rtBBox.top = FX_MIN(rtBBox.top, GetAscent());
         rtBBox.bottom = FX_MAX(rtBBox.bottom, GetDescent());
         FXFT_Done_Glyph(glyph);
         return FXFT_Set_Pixel_Sizes(m_Face, 0, 64) == 0;
     }
     if (FXFT_Load_Glyph(m_Face, iGlyphIndex, FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH)) {
-        return FALSE;
+        return false;
     }
     rtBBox.left = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Glyph_HoriBearingX(m_Face));
     rtBBox.bottom = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Glyph_HoriBearingY(m_Face));
     rtBBox.right = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Glyph_HoriBearingX(m_Face) + FXFT_Get_Glyph_Width(m_Face));
     rtBBox.top = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Glyph_HoriBearingY(m_Face) - FXFT_Get_Glyph_Height(m_Face));
-    return TRUE;
+    return true;
 }
-FX_BOOL CFPF_SkiaFont::GetBBox(FX_RECT &rtBBox)
+bool CFPF_SkiaFont::GetBBox(FX_RECT &rtBBox)
 {
     if (!m_Face) {
-        return FALSE;
+        return false;
     }
     rtBBox.left = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Face_xMin(m_Face));
     rtBBox.top = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Face_yMin(m_Face));
     rtBBox.right = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Face_xMax(m_Face));
     rtBBox.bottom = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Face_yMax(m_Face));
-    return TRUE;
+    return true;
 }
 int32_t CFPF_SkiaFont::GetHeight() const
 {
     if (!m_Face) {
         return 0;
     }
     return      FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Face_Height(m_Face));
 }
 int32_t CFPF_SkiaFont::GetItalicAngle() const
 {
@@ skipping 10 matching lines @@
 {
     if (!m_Face) {
         return 0;
     }
     FT_ULong ulSize = pdfium::base::checked_cast<FT_ULong>(dwSize);
     if (FXFT_Load_Sfnt_Table(m_Face, dwTable, 0, pBuffer, &ulSize)) {
         return 0;
     }
     return pdfium::base::checked_cast<FX_DWORD>(ulSize);
 }
-FX_BOOL CFPF_SkiaFont::InitFont(CFPF_SkiaFontMgr *pFontMgr, CFPF_SkiaFontDescriptor *pFontDes, const CFX_ByteStringC& bsFamily, FX_DWORD dwStyle, uint8_t uCharset)
+bool CFPF_SkiaFont::InitFont(CFPF_SkiaFontMgr *pFontMgr, CFPF_SkiaFontDescriptor *pFontDes, const CFX_ByteStringC& bsFamily, FX_DWORD dwStyle, uint8_t uCharset)
 {
     if (!pFontMgr || !pFontDes) {
-        return FALSE;
+        return false;
     }
     switch (pFontDes->GetType()) {
         case FPF_SKIAFONTTYPE_Path: {
                 CFPF_SkiaPathFont *pFont = (CFPF_SkiaPathFont*)pFontDes;
                 m_Face = pFontMgr->GetFontFace(pFont->m_pPath, pFont->m_iFaceIndex);
             }
             break;
         case FPF_SKIAFONTTYPE_File: {
                 CFPF_SkiaFileFont *pFont = (CFPF_SkiaFileFont*)pFontDes;
                 m_Face = pFontMgr->GetFontFace(pFont->m_pFile, pFont->m_iFaceIndex);
             }
             break;
         case FPF_SKIAFONTTYPE_Buffer: {
                 CFPF_SkiaBufferFont *pFont = (CFPF_SkiaBufferFont*)pFontDes;
                 m_Face = pFontMgr->GetFontFace((const uint8_t*)pFont->m_pBuffer, pFont->m_szBuffer, pFont->m_iFaceIndex);
             }
             break;
         default:
-            return FALSE;
+            return false;
     }
     if (!m_Face) {
-        return FALSE;
+        return false;
     }
     m_dwStyle = dwStyle;
     m_uCharset = uCharset;
     m_pFontMgr = pFontMgr;
     m_pFontDes = pFontDes;
     m_dwRefCount = 1;
-    return TRUE;
+    return true;
 }
 #endif