Revert "FX Bool considered harmful, part 3"

This reverts commit ff46aaf499edcf153ee2f57c7016587aa96dcfa0.
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1255293002 .

4 files changed, 120 insertions, 120 deletions

diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index eb0ca44b64..7cfaed4685 100644
--- a/core/include/fpdfdoc/fpdf_ap.h
+++ b/core/include/fpdfdoc/fpdf_ap.h
@@ -60,7 +60,7 @@ public:
 
     int32_t						GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex);
 
-    bool							IsLatinWord(FX_WORD word);
+    FX_BOOL							IsLatinWord(FX_WORD word);
 
     int32_t						GetDefaultFontIndex();
 private:
@@ -76,20 +76,20 @@ class CPVT_GenerateAP
 {
 public:
 
-    static bool							GenerateTextFieldAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
+    static FX_BOOL							GenerateTextFieldAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
 
-    static bool							GenerateComboBoxAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
+    static FX_BOOL							GenerateComboBoxAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
 
-    static bool							GenerateListBoxAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
+    static FX_BOOL							GenerateListBoxAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
 
     static CFX_ByteString					GenerateEditAP(IPVT_FontMap * pFontMap, IPDF_VariableText_Iterator * pIterator,
-            const CPDF_Point & ptOffset, bool bContinuous, FX_WORD SubWord = 0, const CPVT_WordRange * pVisible = NULL);
+            const CPDF_Point & ptOffset, FX_BOOL bContinuous, FX_WORD SubWord = 0, const CPVT_WordRange * pVisible = NULL);
 
     static CFX_ByteString					GenerateBorderAP(const CPDF_Rect & rect, FX_FLOAT fWidth,
             const CPVT_Color & color, const CPVT_Color & crLeftTop, const CPVT_Color & crRightBottom,
             int32_t nStyle, const CPVT_Dash & dash);
 
-    static CFX_ByteString					GenerateColorAP(const CPVT_Color & color, const bool & bFillOrStroke);
+    static CFX_ByteString					GenerateColorAP(const CPVT_Color & color, const FX_BOOL & bFillOrStroke);
 };
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 36d9d2935a..fc9d3bce87 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -164,26 +164,26 @@ public:
         return m_eUsageType;
     }
 
-    bool			CheckOCGVisible(const CPDF_Dictionary *pOCGDict);
+    FX_BOOL			CheckOCGVisible(const CPDF_Dictionary *pOCGDict);
 
     void			ResetOCContext();
 protected:
 
-    bool			LoadOCGStateFromConfig(const CFX_ByteStringC& csConfig, const CPDF_Dictionary *pOCGDict, bool &bValidConfig) const;
+    FX_BOOL			LoadOCGStateFromConfig(const CFX_ByteStringC& csConfig, const CPDF_Dictionary *pOCGDict, FX_BOOL &bValidConfig) const;
 
-    bool			LoadOCGState(const CPDF_Dictionary *pOCGDict) const;
+    FX_BOOL			LoadOCGState(const CPDF_Dictionary *pOCGDict) const;
 
-    bool			GetOCGVisible(const CPDF_Dictionary *pOCGDict);
+    FX_BOOL			GetOCGVisible(const CPDF_Dictionary *pOCGDict);
 
-    bool			GetOCGVE(CPDF_Array *pExpression, bool bFromConfig, int nLevel = 0);
+    FX_BOOL			GetOCGVE(CPDF_Array *pExpression, FX_BOOL bFromConfig, int nLevel = 0);
 
-    bool			LoadOCMDState(const CPDF_Dictionary *pOCMDDict, bool bFromConfig);
+    FX_BOOL			LoadOCMDState(const CPDF_Dictionary *pOCMDDict, FX_BOOL bFromConfig);
 
     CPDF_Document		*m_pDocument;
 
     UsageType			m_eUsageType;
 
-    std::map<const CPDF_Dictionary*, bool> m_OCGStates;
+    std::map<const CPDF_Dictionary*, FX_BOOL> m_OCGStates;
 };
 class CPDF_LWinParam
 {
@@ -295,7 +295,7 @@ public:
 
     CFX_WideString		GetFilePath() const;
 
-    bool				GetNewWindow() const
+    FX_BOOL				GetNewWindow() const
     {
         return m_pDict->GetBoolean("NewWindow");
     }
@@ -304,7 +304,7 @@ public:
 
     CFX_ByteString		GetURI(CPDF_Document* pDoc) const;
 
-    bool				GetMouseMap() const
+    FX_BOOL				GetMouseMap() const
     {
         return m_pDict->GetBoolean("IsMap");
     }
@@ -314,9 +314,9 @@ public:
         return this;
     }
 
-    bool				GetHideStatus() const
+    FX_BOOL				GetHideStatus() const
     {
-        return m_pDict->GetBoolean("H", true);
+        return m_pDict->GetBoolean("H", TRUE);
     }
 
     CFX_ByteString		GetNamedAction() const
@@ -345,17 +345,17 @@ public:
         return m_pDict->GetNumber("Volume");
     }
 
-    bool				IsSynchronous() const
+    FX_BOOL				IsSynchronous() const
     {
         return m_pDict->GetBoolean("Synchronous");
     }
 
-    bool				IsRepeat() const
+    FX_BOOL				IsRepeat() const
     {
         return m_pDict->GetBoolean("Repeat");
     }
 
-    bool				IsMixPlay() const
+    FX_BOOL				IsMixPlay() const
     {
         return m_pDict->GetBoolean("Mix");
     }
@@ -405,7 +405,7 @@ public:
         DocumentPrinted
     };
 
-    bool				ActionExist(AActionType eType) const;
+    FX_BOOL				ActionExist(AActionType eType) const;
 
     CPDF_Action			GetAction(AActionType eType) const;
 
@@ -455,13 +455,13 @@ public:
         return m_pObj;
     }
 
-    bool			IsURL() const;
+    FX_BOOL			IsURL() const;
 
-    bool			GetFileName(CFX_WideString &wsFileName) const;
+    FX_BOOL			GetFileName(CFX_WideString &wsFileName) const;
 
     CPDF_Stream*	GetFileStream() const;
 
-    void			SetFileName(const CFX_WideStringC& wsFileName, bool bURL = false);
+    void			SetFileName(const CFX_WideStringC& wsFileName, FX_BOOL bURL = FALSE);
 protected:
 
     CPDF_Object		*m_pObj;
@@ -543,13 +543,13 @@ class CPDF_Annot : public CFX_PrivateData
 
     CPDF_Dictionary* GetAnnotDict();
 
-    bool DrawAppearance(const CPDF_Page* pPage,
+    FX_BOOL DrawAppearance(const CPDF_Page* pPage,
                            CFX_RenderDevice* pDevice,
                            const CFX_AffineMatrix* pUser2Device,
                            AppearanceMode mode,
                            const CPDF_RenderOptions* pOptions);
 
-    bool DrawInContext(const CPDF_Page* pPage,
+    FX_BOOL DrawInContext(const CPDF_Page* pPage,
                           const CPDF_RenderContext* pContext,
                           const CFX_AffineMatrix* pUser2Device,
                           AppearanceMode mode);
@@ -585,25 +585,25 @@ public:
     void	GetAnnotRect(const CPDF_Dictionary* pAnnotDict, const CFX_Matrix* pUser2Device, CPDF_Rect &rtAnnot) const;
 
     void				DisplayAnnots(const CPDF_Page* pPage, CFX_RenderDevice* pDevice,
-                                      CFX_AffineMatrix* pMatrix, bool bShowWidget,
+                                      CFX_AffineMatrix* pMatrix, FX_BOOL bShowWidget,
                                       CPDF_RenderOptions* pOptions);
 
     void				DisplayAnnots(const CPDF_Page* pPage, CPDF_RenderContext* pContext,
-                                      bool bPrinting, CFX_AffineMatrix* pMatrix, bool bShowWidget,
+                                      FX_BOOL bPrinting, CFX_AffineMatrix* pMatrix, FX_BOOL bShowWidget,
                                       CPDF_RenderOptions* pOptions)
     {
         DisplayAnnots(pPage, NULL, pContext, bPrinting, pMatrix, bShowWidget ? 3 : 1, pOptions, NULL);
     }
 
     void				DisplayAnnots(const CPDF_Page* pPage, CPDF_RenderContext* pContext,
-                                      bool bPrinting, CFX_AffineMatrix* pMatrix, bool bShowWidget,
+                                      FX_BOOL bPrinting, CFX_AffineMatrix* pMatrix, FX_BOOL bShowWidget,
                                       CPDF_RenderOptions* pOptions, FX_RECT *pClipRect)
     {
         DisplayAnnots(pPage, NULL, pContext, bPrinting, pMatrix, bShowWidget ? 3 : 1, pOptions, pClipRect);
     }
 
     void				DisplayAnnots(const CPDF_Page* pPage, CFX_RenderDevice* pDevice, CPDF_RenderContext* pContext,
-                                      bool bPrinting, CFX_AffineMatrix* pMatrix, FX_DWORD dwAnnotFlags,
+                                      FX_BOOL bPrinting, CFX_AffineMatrix* pMatrix, FX_DWORD dwAnnotFlags,
                                       CPDF_RenderOptions* pOptions, FX_RECT* pClipRect);
 
 
@@ -636,8 +636,8 @@ protected:
     CFX_PtrArray		m_Borders;
 
     void				DisplayPass(const CPDF_Page* pPage, CFX_RenderDevice* pDevice,
-                                    CPDF_RenderContext* pContext, bool bPrinting, CFX_AffineMatrix* pMatrix,
-                                    bool bWidget, CPDF_RenderOptions* pOptions, FX_RECT* clip_rect);
+                                    CPDF_RenderContext* pContext, FX_BOOL bPrinting, CFX_AffineMatrix* pMatrix,
+                                    FX_BOOL bWidget, CPDF_RenderOptions* pOptions, FX_RECT* clip_rect);
     friend class		CPDF_Annot;
 };
 #define COLORTYPE_TRANSPARENT	0
@@ -678,7 +678,7 @@ public:
 
 
 
-    bool				HasFont();
+    FX_BOOL				HasFont();
 
     CFX_ByteString		GetFontString();
 
@@ -687,18 +687,18 @@ public:
 
 
 
-    bool				HasColor(bool bStrokingOperation = false);
+    FX_BOOL				HasColor(FX_BOOL bStrokingOperation = FALSE);
 
-    CFX_ByteString		GetColorString(bool bStrokingOperation = false);
+    CFX_ByteString		GetColorString(FX_BOOL bStrokingOperation = FALSE);
 
-    void				GetColor(int& iColorType, FX_FLOAT fc[4], bool bStrokingOperation = false);
+    void				GetColor(int& iColorType, FX_FLOAT fc[4], FX_BOOL bStrokingOperation = FALSE);
 
-    void				GetColor(FX_ARGB& color, int& iColorType, bool bStrokingOperation = false);
+    void				GetColor(FX_ARGB& color, int& iColorType, FX_BOOL bStrokingOperation = FALSE);
 
 
 
 
-    bool				HasTextMatrix();
+    FX_BOOL				HasTextMatrix();
 
     CFX_ByteString		GetTextMatrixString();
 
@@ -720,15 +720,15 @@ class CPDF_InterForm : public CFX_PrivateData
 {
 public:
 
-    CPDF_InterForm(CPDF_Document* pDocument, bool bUpdateAP);
+    CPDF_InterForm(CPDF_Document* pDocument, FX_BOOL bUpdateAP);
 
     ~CPDF_InterForm();
 
 
 
-    static void				EnableUpdateAP(bool bUpdateAP);
+    static void				EnableUpdateAP(FX_BOOL bUpdateAP);
 
-    static bool			UpdatingAPEnabled();
+    static FX_BOOL			UpdatingAPEnabled();
 
 
     static CFX_ByteString	GenerateNewResourceName(const CPDF_Dictionary* pResDict, const FX_CHAR* csType, int iMinLen = 2, const FX_CHAR* csPrefix = "");
@@ -756,11 +756,11 @@ public:
 
 
 
-    bool					ValidateFieldName(CFX_WideString& csNewFieldName, int iType);
+    FX_BOOL					ValidateFieldName(CFX_WideString& csNewFieldName, int iType);
 
-    bool					ValidateFieldName(const CPDF_FormField* pField, CFX_WideString& csNewFieldName);
+    FX_BOOL					ValidateFieldName(const CPDF_FormField* pField, CFX_WideString& csNewFieldName);
 
-    bool					ValidateFieldName(const CPDF_FormControl* pControl, CFX_WideString& csNewFieldName);
+    FX_BOOL					ValidateFieldName(const CPDF_FormControl* pControl, CFX_WideString& csNewFieldName);
 
 
 
@@ -771,7 +771,7 @@ public:
 
     void					GetAllFieldNames(CFX_WideStringArray& allFieldNames);
 
-    bool					IsValidFormField(const void* pField);
+    FX_BOOL					IsValidFormField(const void* pField);
 
     CPDF_FormField*			GetFieldByDict(CPDF_Dictionary* pFieldDict) const;
 
@@ -782,7 +782,7 @@ public:
 
     CPDF_FormControl*		GetControl(FX_DWORD index, CFX_WideString csFieldName = L"");
 
-    bool					IsValidFormControl(const void* pControl);
+    FX_BOOL					IsValidFormControl(const void* pControl);
 
     int						CountPageControls(CPDF_Page* pPage) const;
 
@@ -817,9 +817,9 @@ public:
 
 
 
-    bool					NeedConstructAP();
+    FX_BOOL					NeedConstructAP();
 
-    void					NeedConstructAP(bool bNeedAP);
+    void					NeedConstructAP(FX_BOOL bNeedAP);
 
 
 
@@ -845,11 +845,11 @@ public:
 
     CPDF_Font*				GetNativeFormFont(CFX_ByteString& csNameTag);
 
-    bool					FindFormFont(const CPDF_Font* pFont, CFX_ByteString& csNameTag);
+    FX_BOOL					FindFormFont(const CPDF_Font* pFont, CFX_ByteString& csNameTag);
 
-    bool					FindFormFont(CFX_ByteString csFontName, CPDF_Font*& pFont, CFX_ByteString& csNameTag);
+    FX_BOOL					FindFormFont(CFX_ByteString csFontName, CPDF_Font*& pFont, CFX_ByteString& csNameTag);
 
-    inline bool			FindFormFont(CFX_WideString csFontName, CPDF_Font*& pFont, CFX_ByteString& csNameTag)
+    inline FX_BOOL			FindFormFont(CFX_WideString csFontName, CPDF_Font*& pFont, CFX_ByteString& csNameTag)
     {
         return FindFormFont(PDF_EncodeText(csFontName), pFont, csNameTag);
     }
@@ -882,20 +882,20 @@ public:
 
 
 
-    CPDF_FormField*			CheckRequiredFields(const CFX_PtrArray *fields = NULL, bool bIncludeOrExclude = true) const;
+    CPDF_FormField*			CheckRequiredFields(const CFX_PtrArray *fields = NULL, FX_BOOL bIncludeOrExclude = TRUE) const;
 
-    CFDF_Document* 			ExportToFDF(const CFX_WideStringC& pdf_path, bool bSimpleFileSpec = false) const;
+    CFDF_Document* 			ExportToFDF(const CFX_WideStringC& pdf_path, FX_BOOL bSimpleFileSpec = FALSE) const;
 
-    CFDF_Document*			ExportToFDF(const CFX_WideStringC& pdf_path, CFX_PtrArray& fields, bool bIncludeOrExclude = true, bool bSimpleFileSpec = false) const;
+    CFDF_Document*			ExportToFDF(const CFX_WideStringC& pdf_path, CFX_PtrArray& fields, FX_BOOL bIncludeOrExclude = TRUE, FX_BOOL bSimpleFileSpec = FALSE) const;
 
-    bool					ImportFromFDF(const CFDF_Document* pFDFDoc, bool bNotify = false);
+    FX_BOOL					ImportFromFDF(const CFDF_Document* pFDFDoc, FX_BOOL bNotify = FALSE);
 
 
 
 
-    bool					ResetForm(const CFX_PtrArray& fields, bool bIncludeOrExclude = true, bool bNotify = false);
+    FX_BOOL					ResetForm(const CFX_PtrArray& fields, FX_BOOL bIncludeOrExclude = TRUE, FX_BOOL bNotify = FALSE);
 
-    bool					ResetForm(bool bNotify = false);
+    FX_BOOL					ResetForm(FX_BOOL bNotify = FALSE);
 
     void					ReloadForm();
 
@@ -907,27 +907,27 @@ public:
     void					SetFormNotify(const CPDF_FormNotify* pNotify);
 
 
-    int						GetPageWithWidget(int iCurPage, bool bNext);
+    int						GetPageWithWidget(int iCurPage, FX_BOOL bNext);
 
 
 
-    bool					IsUpdated()
+    FX_BOOL					IsUpdated()
     {
         return m_bUpdated;
     }
 
     void					ClearUpdatedFlag()
     {
-        m_bUpdated = false;
+        m_bUpdated = FALSE;
     }
 
 
-    bool					HasXFAForm() const;
+    FX_BOOL					HasXFAForm() const;
 
     void					FixPageFields(const CPDF_Page* pPage);
 protected:
 
-    static bool			m_bUpdateAP;
+    static FX_BOOL			m_bUpdateAP;
 
     void					LoadField(CPDF_Dictionary* pFieldDict, int nLevel = 0);
 
@@ -937,9 +937,9 @@ protected:
 
     CPDF_FormControl*		AddControl(const CPDF_FormField* pField, const CPDF_Dictionary* pWidgetDict);
 
-    void					FDF_ImportField(CPDF_Dictionary* pField, const CFX_WideString& parent_name, bool bNotify = false, int nLevel = 0);
+    void					FDF_ImportField(CPDF_Dictionary* pField, const CFX_WideString& parent_name, FX_BOOL bNotify = FALSE, int nLevel = 0);
 
-    bool					ValidateFieldName(CFX_WideString& csNewFieldName, int iType, const CPDF_FormField* pExcludedField, const CPDF_FormControl* pExcludedControl);
+    FX_BOOL					ValidateFieldName(CFX_WideString& csNewFieldName, int iType, const CPDF_FormField* pExcludedField, const CPDF_FormControl* pExcludedControl);
 
     int						CompareFieldName(const CFX_WideString& name1, const CFX_WideString& name2);
 
@@ -947,7 +947,7 @@ protected:
 
     CPDF_Document*			m_pDocument;
 
-    bool					m_bGenerateAP;
+    FX_BOOL					m_bGenerateAP;
 
     CPDF_Dictionary*		m_pFormDict;
 
@@ -959,7 +959,7 @@ protected:
 
     CPDF_FormNotify*		m_pFormNotify;
 
-    bool					m_bUpdated;
+    FX_BOOL					m_bUpdated;
     friend class CPDF_FormControl;
     friend class CPDF_FormField;
 };
@@ -1018,7 +1018,7 @@ public:
         m_pDict = pDict;
     }
 
-    bool					ResetField(bool bNotify = false);
+    FX_BOOL					ResetField(FX_BOOL bNotify = FALSE);
 
 
 
@@ -1075,7 +1075,7 @@ public:
 
     CFX_WideString			GetDefaultValue();
 
-    bool					SetValue(const CFX_WideString& value, bool bNotify = false);
+    FX_BOOL					SetValue(const CFX_WideString& value, FX_BOOL bNotify = FALSE);
 
 
 
@@ -1090,13 +1090,13 @@ public:
 
     int						GetSelectedIndex(int index);
 
-    bool					ClearSelection(bool bNotify = false);
+    FX_BOOL					ClearSelection(FX_BOOL bNotify = FALSE);
 
-    bool					IsItemSelected(int index);
+    FX_BOOL					IsItemSelected(int index);
 
-    bool					SetItemSelection(int index, bool bSelected, bool bNotify = false);
+    FX_BOOL					SetItemSelection(int index, FX_BOOL bSelected, FX_BOOL bNotify = FALSE);
 
-    bool					IsItemDefaultSelected(int index);
+    FX_BOOL					IsItemDefaultSelected(int index);
 
     int						GetDefaultSelectedItem();
 
@@ -1116,7 +1116,7 @@ public:
 
 
 
-    bool					CheckControl(int iControlIndex, bool bChecked, bool bNotify = false);
+    FX_BOOL					CheckControl(int iControlIndex, FX_BOOL bChecked, FX_BOOL bNotify = FALSE);
 
 
 
@@ -1130,11 +1130,11 @@ public:
 
     int						GetSelectedOptionIndex(int index);
 
-    bool					IsOptionSelected(int iOptIndex);
+    FX_BOOL					IsOptionSelected(int iOptIndex);
 
-    bool					SelectOption(int iOptIndex, bool bSelected, bool bNotify = false);
+    FX_BOOL					SelectOption(int iOptIndex, FX_BOOL bSelected, FX_BOOL bNotify = FALSE);
 
-    bool					ClearSelectedOptions(bool bNotify = false);
+    FX_BOOL					ClearSelectedOptions(FX_BOOL bNotify = FALSE);
 
 
 
@@ -1169,9 +1169,9 @@ protected:
 
 
 
-    CFX_WideString			GetValue(bool bDefault);
+    CFX_WideString			GetValue(FX_BOOL bDefault);
 
-    bool					SetValue(const CFX_WideString& value, bool bDefault, bool bNotify);
+    FX_BOOL					SetValue(const CFX_WideString& value, FX_BOOL bDefault, FX_BOOL bNotify);
 
 
     void					SyncFieldFlags();
@@ -1186,9 +1186,9 @@ protected:
 
 
 
-    CFX_WideString			GetCheckValue(bool bDefault);
+    CFX_WideString			GetCheckValue(FX_BOOL bDefault);
 
-    bool					SetCheckValue(const CFX_WideString& value, bool bDefault, bool bNotify);
+    FX_BOOL					SetCheckValue(const CFX_WideString& value, FX_BOOL bDefault, FX_BOOL bNotify);
 
 
     FX_FLOAT				m_FontSize;
@@ -1225,7 +1225,7 @@ public:
 
 
 
-    bool					IsProportionalScale();
+    FX_BOOL					IsProportionalScale();
 
 
 
@@ -1235,7 +1235,7 @@ public:
 
 
 
-    bool					GetFittingBounds();
+    FX_BOOL					GetFittingBounds();
 
 
     CPDF_Dictionary*		m_pDict;
@@ -1283,9 +1283,9 @@ public:
 
     CFX_WideString			GetExportValue();
 
-    bool					IsChecked();
+    FX_BOOL					IsChecked();
 
-    bool					IsDefaultChecked();
+    FX_BOOL					IsDefaultChecked();
 
 
 
@@ -1303,7 +1303,7 @@ public:
 
 
 
-    bool					HasMKEntry(CFX_ByteString csEntry);
+    FX_BOOL					HasMKEntry(CFX_ByteString csEntry);
 
 
 
@@ -1434,7 +1434,7 @@ protected:
 
     void					SetOnStateName(const CFX_ByteString& csOn);
 
-    void					CheckControl(bool bChecked);
+    void					CheckControl(FX_BOOL bChecked);
 
     FX_ARGB					GetColor(int& iColorType, CFX_ByteString csEntry);
 
@@ -1446,7 +1446,7 @@ protected:
 
     CPDF_Stream*			GetIcon(CFX_ByteString csEntry);
 
-    CPDF_ApSettings			GetMK(bool bCreate);
+    CPDF_ApSettings			GetMK(FX_BOOL bCreate);
 
     CPDF_InterForm*			m_pForm;
 
@@ -1507,7 +1507,7 @@ public:
         return 0;
     }
 };
-bool		FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
+FX_BOOL		FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict);
 class CPDF_PageLabel
 {
 public:
@@ -1559,9 +1559,9 @@ public:
     ~CPDF_ViewerPreferences();
 
 
-    bool IsDirectionR2L() const;
+    FX_BOOL IsDirectionR2L() const;
 
-    bool PrintScaling() const;
+    FX_BOOL PrintScaling() const;
 
     int32_t NumCopies() const;
 
@@ -1586,7 +1586,7 @@ public:
         return m_pDict;
     }
 
-    bool					HasMKEntry(const CFX_ByteStringC& csEntry);
+    FX_BOOL					HasMKEntry(const CFX_ByteStringC& csEntry);
 
 
 
diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/include/fpdfdoc/fpdf_tagged.h
index 9761e01c60..706f5c04d7 100644
--- a/core/include/fpdfdoc/fpdf_tagged.h
+++ b/core/include/fpdfdoc/fpdf_tagged.h
@@ -85,17 +85,17 @@ public:
 
     virtual CFX_PtrArray*		GetObjectArray() = 0;
 
-    virtual CPDF_Object*		GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, bool bInheritable = false, FX_FLOAT fLevel = 0.0F) = 0;
+    virtual CPDF_Object*		GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable = FALSE, FX_FLOAT fLevel = 0.0F) = 0;
 
 
 
-    virtual CFX_ByteString		GetName(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, const CFX_ByteStringC& default_value, bool bInheritable = false, int subindex = -1) = 0;
+    virtual CFX_ByteString		GetName(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, const CFX_ByteStringC& default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
 
-    virtual FX_ARGB				GetColor(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_ARGB default_value, bool bInheritable = false, int subindex = -1) = 0;
+    virtual FX_ARGB				GetColor(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_ARGB default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
 
-    virtual FX_FLOAT			GetNumber(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_FLOAT default_value, bool bInheritable = false, int subindex = -1) = 0;
+    virtual FX_FLOAT			GetNumber(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_FLOAT default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
 
-    virtual int					GetInteger(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, int default_value, bool bInheritable = false, int subindex = -1) = 0;
+    virtual int					GetInteger(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, int default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
 
 };
 
diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h
index 7f89e8d31e..4baba41348 100644
--- a/core/include/fpdfdoc/fpdf_vt.h
+++ b/core/include/fpdfdoc/fpdf_vt.h
@@ -39,12 +39,12 @@ struct CPVT_WordPlace {
         nSecIndex = nLineIndex = nWordIndex = -1;
     }
 
-    bool operator == (const CPVT_WordPlace & wp) const
+    FX_BOOL operator == (const CPVT_WordPlace & wp) const
     {
         return wp.nSecIndex == nSecIndex && wp.nLineIndex == nLineIndex && wp.nWordIndex == nWordIndex;
     }
 
-    bool operator != (const CPVT_WordPlace & wp) const
+    FX_BOOL operator != (const CPVT_WordPlace & wp) const
     {
         return wp.nSecIndex != nSecIndex || wp.nLineIndex != nLineIndex || wp.nWordIndex != nWordIndex;
     }
@@ -142,12 +142,12 @@ struct CPVT_WordRange {
         SwapWordPlace();
     }
 
-    bool IsExist() const
+    FX_BOOL IsExist() const
     {
         return BeginPos != EndPos;
     }
 
-    bool operator != (const CPVT_WordRange & wr) const
+    FX_BOOL operator != (const CPVT_WordRange & wr) const
     {
         return wr.BeginPos != BeginPos || wr.EndPos != EndPos;
     }
@@ -290,7 +290,7 @@ public:
 
     virtual int32_t						GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex) = 0;
 
-    virtual bool							IsLatinWord(FX_WORD word) = 0;
+    virtual FX_BOOL							IsLatinWord(FX_WORD word) = 0;
 
     virtual int32_t						GetDefaultFontIndex() = 0;
 };
@@ -299,27 +299,27 @@ class IPDF_VariableText_Iterator
 public:
     virtual ~IPDF_VariableText_Iterator() { }
 
-    virtual bool							NextWord() = 0;
+    virtual FX_BOOL							NextWord() = 0;
 
-    virtual bool							PrevWord() = 0;
+    virtual FX_BOOL							PrevWord() = 0;
 
-    virtual bool							NextLine() = 0;
+    virtual FX_BOOL							NextLine() = 0;
 
-    virtual bool							PrevLine() = 0;
+    virtual FX_BOOL							PrevLine() = 0;
 
-    virtual bool							NextSection() = 0;
+    virtual FX_BOOL							NextSection() = 0;
 
-    virtual bool							PrevSection() = 0;
+    virtual FX_BOOL							PrevSection() = 0;
 
-    virtual bool							GetWord(CPVT_Word & word) const = 0;
+    virtual FX_BOOL							GetWord(CPVT_Word & word) const = 0;
 
-    virtual bool							SetWord(const CPVT_Word & word) = 0;
+    virtual FX_BOOL							SetWord(const CPVT_Word & word) = 0;
 
-    virtual bool							GetLine(CPVT_Line & line) const = 0;
+    virtual FX_BOOL							GetLine(CPVT_Line & line) const = 0;
 
-    virtual bool							GetSection(CPVT_Section & section) const = 0;
+    virtual FX_BOOL							GetSection(CPVT_Section & section) const = 0;
 
-    virtual	bool							SetSection(const CPVT_Section & section) = 0;
+    virtual	FX_BOOL							SetSection(const CPVT_Section & section) = 0;
 
     virtual void							SetAt(int32_t nWordIndex) = 0;
 
@@ -352,23 +352,23 @@ public:
 
     virtual void							SetHorzScale(int32_t nHorzScale = 100) = 0;
 
-    virtual void							SetMultiLine(bool bMultiLine = true) = 0;
+    virtual void							SetMultiLine(FX_BOOL bMultiLine = TRUE) = 0;
 
-    virtual void							SetAutoReturn(bool bAuto = true) = 0;
+    virtual void							SetAutoReturn(FX_BOOL bAuto = TRUE) = 0;
 
-    virtual void							SetAutoFontSize(bool bAuto = true) = 0;
+    virtual void							SetAutoFontSize(FX_BOOL bAuto = TRUE) = 0;
 
     virtual void							SetFontSize(FX_FLOAT fFontSize) = 0;
 
     virtual void							SetLineLeading(FX_FLOAT fLineLeading) = 0;
 
-    virtual void							SetRichText(bool bRichText) = 0;
+    virtual void							SetRichText(FX_BOOL bRichText) = 0;
 
     virtual void							Initialize() = 0;
 
-    virtual bool							IsValid() const = 0;
+    virtual FX_BOOL							IsValid() const = 0;
 
-    virtual bool							IsRichText() const = 0;
+    virtual FX_BOOL							IsRichText() const = 0;
 
     virtual void							RearrangeAll() = 0;
 
@@ -410,7 +410,7 @@ public:
 
     virtual int32_t						GetLimitChar() const = 0;
 
-    virtual bool							IsMultiLine() const = 0;
+    virtual FX_BOOL							IsMultiLine() const = 0;
 
     virtual int32_t						GetHorzScale() const = 0;
 
@@ -440,7 +440,7 @@ public:
 
     virtual void							UpdateWordPlace(CPVT_WordPlace & place) const = 0;
 
-    virtual CPVT_WordPlace					AjustLineHeader(const CPVT_WordPlace & place, bool bPrevOrNext) const = 0;
+    virtual CPVT_WordPlace					AjustLineHeader(const CPVT_WordPlace & place, FX_BOOL bPrevOrNext) const = 0;
 
     virtual int32_t						WordPlaceToWordIndex(const CPVT_WordPlace & place) const = 0;