Revert "FX Bool considered harmful, part 3"

core/include/fpdfapi/fpdf_render.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
 
 #include "../../../third_party/base/nonstd_unique_ptr.h"
@@ skipping 15 matching lines @@
 class CPDF_ShadingObject;
 class CPDF_TextObject;
 class IFX_Pause;
 
 class IPDF_OCContext
 {
 public:
 
     virtual ~IPDF_OCContext() {}
 
-    virtual bool        CheckOCGVisible(const CPDF_Dictionary* pOCG) = 0;
+    virtual FX_BOOL     CheckOCGVisible(const CPDF_Dictionary* pOCG) = 0;
 
-    bool CheckObjectVisible(const CPDF_PageObject* pObj);
+    FX_BOOL CheckObjectVisible(const CPDF_PageObject* pObj);
 };
 #define RENDER_COLOR_NORMAL             0
 #define RENDER_COLOR_GRAY               1
 #define RENDER_COLOR_TWOCOLOR   2
 #define RENDER_COLOR_ALPHA              3
 #define RENDER_CLEARTYPE                        0x00000001
 #define RENDER_PRINTGRAPHICTEXT         0x00000002
 #define RENDER_FORCE_DOWNSAMPLE         0x00000004
 #define RENDER_PRINTPREVIEW                     0x00000008
 #define RENDER_BGR_STRIPE                       0x00000010
@@ skipping 33 matching lines @@
     int                         m_HalftoneLimit;
 
     FX_ARGB                     TranslateColor(FX_ARGB argb) const;
 };
 class CPDF_RenderContext
 {
 public:
 
     CPDF_RenderContext();
 
-    void                        Create(CPDF_Page* pPage, bool bFirstLayer = true);
+    void                        Create(CPDF_Page* pPage, FX_BOOL bFirstLayer = TRUE);
 
     void                        Create(CPDF_Document* pDoc = NULL, CPDF_PageRenderCache* pPageCache = NULL,
-                           CPDF_Dictionary* pPageResources = NULL, bool bFirstLayer = true);
+                           CPDF_Dictionary* pPageResources = NULL, FX_BOOL bFirstLayer = TRUE);
 
     ~CPDF_RenderContext();
 
     void                        Clear();
 
     void                        AppendObjectList(CPDF_PageObjects* pObjs, const CFX_AffineMatrix* pObject2Device);
 
     void                        Render(CFX_RenderDevice* pDevice, const CPDF_RenderOptions* pOptions = NULL,
                            const CFX_AffineMatrix* pFinalMatrix = NULL);
 
@@ skipping 13 matching lines @@
     CPDF_Document*                      m_pDocument;
 
     CPDF_Dictionary*            m_pPageResources;
 
     CPDF_PageRenderCache*       m_pPageCache;
 
 protected:
 
     CFX_ArrayTemplate<struct _PDF_RenderItem>   m_ContentList;
 
-    bool                                        m_bFirstLayer;
+    FX_BOOL                                     m_bFirstLayer;
 
     void                        Render(CFX_RenderDevice* pDevice, const CPDF_PageObject* pStopObj,
                            const CPDF_RenderOptions* pOptions, const CFX_AffineMatrix* pFinalMatrix);
     friend class CPDF_RenderStatus;
     friend class CPDF_ProgressiveRenderer;
 };
 
 class CPDF_ProgressiveRenderer
 {
 public:
@@ skipping 45 matching lines @@
                                    CPDF_Font* pFont,
                                    FX_FLOAT font_size,
                                    const CFX_AffineMatrix* matrix,
                                    const CFX_ByteString& str,
                                    FX_ARGB fill_argb,
                                    FX_ARGB stroke_argb = 0,
                                    const CFX_GraphStateData* pGraphState = NULL,
                                    const CPDF_RenderOptions* pOptions = NULL
                                );
 
-    static bool DrawTextPath(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,
+    static FX_BOOL      DrawTextPath(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,
                                  CPDF_Font* pFont, FX_FLOAT font_size,
                                  const CFX_AffineMatrix* pText2User, const CFX_AffineMatrix* pUser2Device,
                                  const CFX_GraphStateData* pGraphState,
                                  FX_ARGB fill_argb, FX_ARGB stroke_argb, CFX_PathData* pClippingPath, int nFlag = 0);
 
-    static bool DrawNormalText(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,
+    static FX_BOOL      DrawNormalText(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,
                                    CPDF_Font* pFont, FX_FLOAT font_size, const CFX_AffineMatrix* pText2Device,
                                    FX_ARGB fill_argb, const CPDF_RenderOptions* pOptions);
 
-    static bool DrawType3Text(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,
+    static FX_BOOL      DrawType3Text(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,
                                   CPDF_Font* pFont, FX_FLOAT font_size, const CFX_AffineMatrix* pText2Device,
                                   FX_ARGB fill_argb);
 };
 class CPDF_PageRenderCache
 {
 public:
     CPDF_PageRenderCache(CPDF_Page* pPage)
     {
         m_pPage = pPage;
         m_nTimeCount = 0;
         m_nCacheSize = 0;
         m_pCurImageCache = NULL;
-        m_bCurFindCache = false;
+        m_bCurFindCache = FALSE;
         m_pCurImageCaches = NULL;
     }
     ~CPDF_PageRenderCache()
     {
         ClearAll();
     }
     void                                ClearAll();
     void                                ClearImageData();
 
     FX_DWORD                    EstimateSize();
     void                                CacheOptimization(int32_t dwLimitCacheSize);
     FX_DWORD                    GetCachedSize(CPDF_Stream* pStream) const;
     FX_DWORD                    GetTimeCount() const
     {
         return m_nTimeCount;
     }
     void                                SetTimeCount(FX_DWORD dwTimeCount)
     {
         m_nTimeCount = dwTimeCount;
     }
 
     void                                GetCachedBitmap(CPDF_Stream* pStream, CFX_DIBSource*& pBitmap, CFX_DIBSource*& pMask, FX_DWORD& MatteColor,
-                                        bool bStdCS = false, FX_DWORD GroupFamily = 0, bool bLoadMask = false,
+                                        FX_BOOL bStdCS = FALSE, FX_DWORD GroupFamily = 0, FX_BOOL bLoadMask = FALSE,
                                         CPDF_RenderStatus* pRenderStatus = NULL, int32_t downsampleWidth = 0, int32_t downsampleHeight = 0);
 
     void                                ResetBitmap(CPDF_Stream* pStream, const CFX_DIBitmap* pBitmap);
     void                                ClearImageCache(CPDF_Stream* pStream);
     CPDF_Page*                  GetPage()
     {
         return m_pPage;
     }
     CFX_MapPtrToPtr             m_ImageCaches;
 public:
-    bool                                StartGetCachedBitmap(CPDF_Stream* pStream, bool bStdCS = false, FX_DWORD GroupFamily = 0,
-            bool bLoadMask = false, CPDF_RenderStatus* pRenderStatus = NULL,
+    FX_BOOL                             StartGetCachedBitmap(CPDF_Stream* pStream, FX_BOOL bStdCS = FALSE, FX_DWORD GroupFamily = 0,
+            FX_BOOL bLoadMask = FALSE, CPDF_RenderStatus* pRenderStatus = NULL,
             int32_t downsampleWidth = 0, int32_t downsampleHeight = 0);
 
-    bool                                Continue(IFX_Pause* pPause);
+    FX_BOOL                             Continue(IFX_Pause* pPause);
     CPDF_ImageCache*    m_pCurImageCache;
     CFX_PtrArray*       m_pCurImageCaches;
 protected:
     friend class                CPDF_Page;
     CPDF_Page*                  m_pPage;
 
     FX_DWORD                    m_nTimeCount;
     FX_DWORD                    m_nCacheSize;
-    bool                                m_bCurFindCache;
+    FX_BOOL                             m_bCurFindCache;
 };
 class CPDF_RenderConfig
 {
 public:
     CPDF_RenderConfig();
     ~CPDF_RenderConfig();
     int                                 m_HalftoneLimit;
     int                                 m_RenderStepLimit;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_