Remove FX_BOOL from xfa.

Review-Url: https://codereview.chromium.org/2467203003

1 files changed, 62 insertions, 63 deletions

diff --git a/xfa/fde/css/fde_cssdeclaration.h b/xfa/fde/css/fde_cssdeclaration.h
index 3598429e3a..f03b0c616a 100644
--- a/xfa/fde/css/fde_cssdeclaration.h
+++ b/xfa/fde/css/fde_cssdeclaration.h
@@ -14,7 +14,7 @@
 class FDE_CSSPropertyHolder : public CFX_Target {
  public:
   int16_t eProperty;
-  FX_BOOL bImportant;
+  bool bImportant;
   IFDE_CSSValue* pValue;
   FDE_CSSPropertyHolder* pNext;
 };
@@ -40,88 +40,87 @@ class CFDE_CSSDeclaration : public CFX_Target {
         m_pFirstCustom(nullptr),
         m_pLastCustom(nullptr) {}
 
-  IFDE_CSSValue* GetProperty(FDE_CSSPROPERTY eProperty,
-                             FX_BOOL& bImportant) const;
+  IFDE_CSSValue* GetProperty(FDE_CSSPROPERTY eProperty, bool& bImportant) const;
   FX_POSITION GetStartPosition() const;
   void GetNextProperty(FX_POSITION& pos,
                        FDE_CSSPROPERTY& eProperty,
                        IFDE_CSSValue*& pValue,
-                       FX_BOOL& bImportant) const;
+                       bool& bImportant) const;
   FX_POSITION GetStartCustom() const;
   void GetNextCustom(FX_POSITION& pos,
                      CFX_WideString& wsName,
                      CFX_WideString& wsValue) const;
-  FX_BOOL AddProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                      const FX_WCHAR* pszValue,
-                      int32_t iValueLen);
-  FX_BOOL AddProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                      const FX_WCHAR* pszName,
-                      int32_t iNameLen,
-                      const FX_WCHAR* pszValue,
-                      int32_t iValueLen);
+  bool AddProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                   const FX_WCHAR* pszValue,
+                   int32_t iValueLen);
+  bool AddProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                   const FX_WCHAR* pszName,
+                   int32_t iNameLen,
+                   const FX_WCHAR* pszValue,
+                   int32_t iValueLen);
 
  protected:
-  FX_BOOL ParseTextEmphasisProperty(FDE_CSSPROPERTYARGS* pArgs,
-                                    const FX_WCHAR* pszValue,
-                                    int32_t iValueLen,
-                                    FX_BOOL bImportant);
-  FX_BOOL ParseColumnsProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                               const FX_WCHAR* pszValue,
-                               int32_t iValueLen,
-                               FX_BOOL bImportant);
-  FX_BOOL ParseColumnRuleProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                                  const FX_WCHAR* pszValue,
-                                  int32_t iValueLen,
-                                  FX_BOOL bImportant);
-  FX_BOOL ParseOverflowProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                                const FX_WCHAR* pszValue,
-                                int32_t iValueLen,
-                                FX_BOOL bImportant);
-  FX_BOOL ParseFontProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                            const FX_WCHAR* pszValue,
-                            int32_t iValueLen,
-                            FX_BOOL bImportant);
-  FX_BOOL ParseBackgroundProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                                  const FX_WCHAR* pszValue,
-                                  int32_t iValueLen,
-                                  FX_BOOL bImportant);
-  FX_BOOL ParseListStyleProperty(const FDE_CSSPROPERTYARGS* pArgs,
+  bool ParseTextEmphasisProperty(FDE_CSSPROPERTYARGS* pArgs,
                                  const FX_WCHAR* pszValue,
                                  int32_t iValueLen,
-                                 FX_BOOL bImportant);
-  FX_BOOL ParseBorderPropoerty(IFX_MemoryAllocator* pStaticStore,
+                                 bool bImportant);
+  bool ParseColumnsProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                            const FX_WCHAR* pszValue,
+                            int32_t iValueLen,
+                            bool bImportant);
+  bool ParseColumnRuleProperty(const FDE_CSSPROPERTYARGS* pArgs,
                                const FX_WCHAR* pszValue,
                                int32_t iValueLen,
-                               IFDE_CSSValue*& pColor,
-                               IFDE_CSSValue*& pStyle,
-                               IFDE_CSSValue*& pWidth) const;
+                               bool bImportant);
+  bool ParseOverflowProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                             const FX_WCHAR* pszValue,
+                             int32_t iValueLen,
+                             bool bImportant);
+  bool ParseFontProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                         const FX_WCHAR* pszValue,
+                         int32_t iValueLen,
+                         bool bImportant);
+  bool ParseBackgroundProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                               const FX_WCHAR* pszValue,
+                               int32_t iValueLen,
+                               bool bImportant);
+  bool ParseListStyleProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                              const FX_WCHAR* pszValue,
+                              int32_t iValueLen,
+                              bool bImportant);
+  bool ParseBorderPropoerty(IFX_MemoryAllocator* pStaticStore,
+                            const FX_WCHAR* pszValue,
+                            int32_t iValueLen,
+                            IFDE_CSSValue*& pColor,
+                            IFDE_CSSValue*& pStyle,
+                            IFDE_CSSValue*& pWidth) const;
   void AddBorderProperty(IFX_MemoryAllocator* pStaticStore,
                          IFDE_CSSValue* pColor,
                          IFDE_CSSValue* pStyle,
                          IFDE_CSSValue* pWidth,
-                         FX_BOOL bImportant,
+                         bool bImportant,
                          FDE_CSSPROPERTY eColor,
                          FDE_CSSPROPERTY eStyle,
                          FDE_CSSPROPERTY eWidth);
-  FX_BOOL ParseContentProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                               const FX_WCHAR* pszValue,
-                               int32_t iValueLen,
-                               FX_BOOL bImportant);
-  FX_BOOL ParseCounterProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                               const FX_WCHAR* pszValue,
-                               int32_t iValueLen,
-                               FX_BOOL bImportant);
-  FX_BOOL ParseValueListProperty(const FDE_CSSPROPERTYARGS* pArgs,
-                                 const FX_WCHAR* pszValue,
-                                 int32_t iValueLen,
-                                 FX_BOOL bImportant);
-  FX_BOOL Add4ValuesProperty(IFX_MemoryAllocator* pStaticStore,
-                             const CFDE_CSSValueArray& list,
-                             FX_BOOL bImportant,
-                             FDE_CSSPROPERTY eLeft,
-                             FDE_CSSPROPERTY eTop,
-                             FDE_CSSPROPERTY eRight,
-                             FDE_CSSPROPERTY eBottom);
+  bool ParseContentProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                            const FX_WCHAR* pszValue,
+                            int32_t iValueLen,
+                            bool bImportant);
+  bool ParseCounterProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                            const FX_WCHAR* pszValue,
+                            int32_t iValueLen,
+                            bool bImportant);
+  bool ParseValueListProperty(const FDE_CSSPROPERTYARGS* pArgs,
+                              const FX_WCHAR* pszValue,
+                              int32_t iValueLen,
+                              bool bImportant);
+  bool Add4ValuesProperty(IFX_MemoryAllocator* pStaticStore,
+                          const CFDE_CSSValueArray& list,
+                          bool bImportant,
+                          FDE_CSSPROPERTY eLeft,
+                          FDE_CSSPROPERTY eTop,
+                          FDE_CSSPROPERTY eRight,
+                          FDE_CSSPROPERTY eBottom);
   IFDE_CSSValue* ParseNumber(const FDE_CSSPROPERTYARGS* pArgs,
                              const FX_WCHAR* pszValue,
                              int32_t iValueLen);
@@ -146,7 +145,7 @@ class CFDE_CSSDeclaration : public CFX_Target {
   void AddPropertyHolder(IFX_MemoryAllocator* pStaticStore,
                          FDE_CSSPROPERTY eProperty,
                          IFDE_CSSValue* pValue,
-                         FX_BOOL bImportant);
+                         bool bImportant);
   IFDE_CSSPrimitiveValue* NewNumberValue(IFX_MemoryAllocator* pStaticStore,
                                          FDE_CSSPRIMITIVETYPE eUnit,
                                          FX_FLOAT fValue) const;