FX Bool considered harmful, part 3

core/src/fpdfdoc/doc_annot.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 "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 
 CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage)
 {
     ASSERT(pPage != NULL);
     m_pPageDict = pPage->m_pFormDict;
     if (m_pPageDict == NULL) {
         return;
     }
     m_pDocument = pPage->m_pDocument;
     CPDF_Array* pAnnots = m_pPageDict->GetArray("Annots");
     if (pAnnots == NULL) {
         return;
     }
     CPDF_Dictionary* pRoot = m_pDocument->GetRoot();
     CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
-    FX_BOOL bRegenerateAP = pAcroForm && pAcroForm->GetBoolean("NeedAppearances");
+    bool bRegenerateAP = pAcroForm && pAcroForm->GetBoolean("NeedAppearances");
     for (FX_DWORD i = 0; i < pAnnots->GetCount(); ++i) {
         CPDF_Dictionary* pDict = (CPDF_Dictionary*)pAnnots->GetElementValue(i);
         if (pDict == NULL || pDict->GetType() != PDFOBJ_DICTIONARY) {
             continue;
         }
         FX_DWORD dwObjNum = pDict->GetObjNum();
         if (dwObjNum == 0) {
             dwObjNum = m_pDocument->AddIndirectObject(pDict);
             CPDF_Reference* pAction = new CPDF_Reference(m_pDocument, dwObjNum);
             pAnnots->InsertAt(i, pAction);
@@ skipping 12 matching lines @@
 {
     int i = 0;
     for (i = 0; i < m_AnnotList.GetSize(); ++i) {
         delete (CPDF_Annot*)m_AnnotList[i];
     }
     for (i = 0; i < m_Borders.GetSize(); ++i) {
         delete (CPDF_PageObjects*)m_Borders[i];
     }
 }
 void CPDF_AnnotList::DisplayPass(const CPDF_Page* pPage, CFX_RenderDevice* pDevice,
-                                 CPDF_RenderContext* pContext, FX_BOOL bPrinting, CFX_AffineMatrix* pMatrix,
-                                 FX_BOOL bWidgetPass, CPDF_RenderOptions* pOptions, FX_RECT* clip_rect)
+                                 CPDF_RenderContext* pContext, bool bPrinting, CFX_AffineMatrix* pMatrix,
+                                 bool bWidgetPass, CPDF_RenderOptions* pOptions, FX_RECT* clip_rect)
 {
     for (int i = 0; i < m_AnnotList.GetSize(); ++i) {
         CPDF_Annot* pAnnot = (CPDF_Annot*)m_AnnotList[i];
-        FX_BOOL bWidget = pAnnot->GetSubType() == "Widget";
+        bool bWidget = pAnnot->GetSubType() == "Widget";
         if ((bWidgetPass && !bWidget) || (!bWidgetPass && bWidget)) {
             continue;
         }
         FX_DWORD annot_flags = pAnnot->GetFlags();
         if (annot_flags & ANNOTFLAG_HIDDEN) {
             continue;
         }
         if (bPrinting && (annot_flags & ANNOTFLAG_PRINT) == 0) {
             continue;
         }
@@ skipping 22 matching lines @@
         }
         if (pContext) {
             pAnnot->DrawInContext(pPage, pContext, &matrix, CPDF_Annot::Normal);
         } else if (!pAnnot->DrawAppearance(pPage, pDevice, &matrix, CPDF_Annot::Normal, pOptions)) {
             pAnnot->DrawBorder(pDevice, &matrix, pOptions);
         }
     }
 }
 void CPDF_AnnotList::DisplayAnnots(const CPDF_Page* pPage, CFX_RenderDevice* pDevice,
                                    CFX_AffineMatrix* pUser2Device,
-                                   FX_BOOL bShowWidget, CPDF_RenderOptions* pOptions)
+                                   bool bShowWidget, CPDF_RenderOptions* pOptions)
 {
     FX_RECT clip_rect;
     if (pDevice) {
         clip_rect = pDevice->GetClipBox();
     }
-    FX_BOOL bPrinting = pDevice->GetDeviceClass() == FXDC_PRINTER || (pOptions && (pOptions->m_Flags & RENDER_PRINTPREVIEW));
+    bool bPrinting = pDevice->GetDeviceClass() == FXDC_PRINTER || (pOptions && (pOptions->m_Flags & RENDER_PRINTPREVIEW));
     DisplayAnnots(pPage, pDevice, NULL, bPrinting, pUser2Device, bShowWidget ? 3 : 1, pOptions, &clip_rect);
 }
 void CPDF_AnnotList::DisplayAnnots(const CPDF_Page* pPage, CFX_RenderDevice* pDevice, CPDF_RenderContext* pContext,
-                                   FX_BOOL bPrinting, CFX_AffineMatrix* pUser2Device, FX_DWORD dwAnnotFlags,
+                                   bool bPrinting, CFX_AffineMatrix* pUser2Device, FX_DWORD dwAnnotFlags,
                                    CPDF_RenderOptions* pOptions, FX_RECT* pClipRect)
 {
     if (dwAnnotFlags & 0x01) {
-        DisplayPass(pPage, pDevice, pContext, bPrinting, pUser2Device, FALSE, pOptions, pClipRect);
+        DisplayPass(pPage, pDevice, pContext, bPrinting, pUser2Device, false, pOptions, pClipRect);
     }
     if (dwAnnotFlags & 0x02) {
-        DisplayPass(pPage, pDevice, pContext, bPrinting, pUser2Device, TRUE, pOptions, pClipRect);
+        DisplayPass(pPage, pDevice, pContext, bPrinting, pUser2Device, true, pOptions, pClipRect);
     }
 }
 int CPDF_AnnotList::GetIndex(CPDF_Annot* pAnnot)
 {
     for (int i = 0; i < m_AnnotList.GetSize(); ++i)
         if (m_AnnotList[i] == (void*)pAnnot) {
             return i;
         }
     return -1;
 }
@@ skipping 105 matching lines @@
     }
     CFX_FloatRect form_bbox = pForm->m_pFormDict->GetRect(FX_BSTRC("BBox"));
     CFX_Matrix form_matrix = pForm->m_pFormDict->GetMatrix(FX_BSTRC("Matrix"));
     form_matrix.TransformRect(form_bbox);
     CPDF_Rect arect;
     pAnnot->GetRect(arect);
     matrix.MatchRect(arect, form_bbox);
     matrix.Concat(*pUser2Device);
     return pForm;
 }
-FX_BOOL CPDF_Annot::DrawAppearance(const CPDF_Page* pPage, CFX_RenderDevice* pDevice, const CFX_AffineMatrix* pUser2Device,
+bool CPDF_Annot::DrawAppearance(const CPDF_Page* pPage, CFX_RenderDevice* pDevice, const CFX_AffineMatrix* pUser2Device,
                                    AppearanceMode mode, const CPDF_RenderOptions* pOptions)
 {
     CFX_Matrix matrix;
     CPDF_Form* pForm = FPDFDOC_Annot_GetMatrix(pPage, this, mode, pUser2Device, matrix);
     if (!pForm) {
-        return FALSE;
+        return false;
     }
     CPDF_RenderContext context;
     context.Create((CPDF_Page*)pPage);
     context.DrawObjectList(pDevice, pForm, &matrix, pOptions);
-    return TRUE;
+    return true;
 }
-FX_BOOL CPDF_Annot::DrawInContext(const CPDF_Page* pPage, const CPDF_RenderContext* pContext, const CFX_AffineMatrix* pUser2Device, AppearanceMode mode)
+bool CPDF_Annot::DrawInContext(const CPDF_Page* pPage, const CPDF_RenderContext* pContext, const CFX_AffineMatrix* pUser2Device, AppearanceMode mode)
 {
     CFX_Matrix matrix;
     CPDF_Form* pForm = FPDFDOC_Annot_GetMatrix(pPage, this, mode, pUser2Device, matrix);
     if (!pForm) {
-        return FALSE;
+        return false;
     }
     ((CPDF_RenderContext*)pContext)->AppendObjectList(pForm, &matrix);
-    return TRUE;
+    return true;
 }
 void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice, const CFX_AffineMatrix* pUser2Device, const CPDF_RenderOptions* pOptions)
 {
     if (GetSubType() == "Popup") {
         return;
     }
     FX_DWORD annot_flags = GetFlags();
     if (annot_flags & ANNOTFLAG_HIDDEN) {
         return;
     }
-    FX_BOOL bPrinting = pDevice->GetDeviceClass() == FXDC_PRINTER || (pOptions && (pOptions->m_Flags & RENDER_PRINTPREVIEW));
+    bool bPrinting = pDevice->GetDeviceClass() == FXDC_PRINTER || (pOptions && (pOptions->m_Flags & RENDER_PRINTPREVIEW));
     if (bPrinting && (annot_flags & ANNOTFLAG_PRINT) == 0) {
         return;
     }
     if (!bPrinting && (annot_flags & ANNOTFLAG_NOVIEW)) {
         return;
     }
     CPDF_Dictionary* pBS = m_pAnnotDict->GetDict("BS");
     char style_char;
     FX_FLOAT width;
     CPDF_Array* pDashArray = NULL;
@@ skipping 67 matching lines @@
     GetRect(rect);
     CPDF_PathData path;
     width /= 2;
     path.AppendRect(rect.left + width, rect.bottom + width, rect.right - width, rect.top - width);
     int fill_type = 0;
     if (pOptions && (pOptions->m_Flags & RENDER_NOPATHSMOOTH)) {
         fill_type |= FXFILL_NOPATHSMOOTH;
     }
     pDevice->DrawPath(&path, pUser2Device, &graph_state, argb, argb, fill_type);
 }