Remove some FX_BOOLs

Grepping for FX_BOOL and |==| on the same line gives
a very strong clue that the expression won't be out
of range of the |bool| type iteself.

R=thestig@chromium.org

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

6 files changed, 38 insertions, 39 deletions

diff --git a/xfa/src/fgas/include/fx_datetime.h b/xfa/src/fgas/include/fx_datetime.h
index 89b8a92d13..fa1ff6e16a 100644
--- a/xfa/src/fgas/include/fx_datetime.h
+++ b/xfa/src/fgas/include/fx_datetime.h
@@ -102,58 +102,58 @@ class CFX_Unitime {
   friend CFX_Unitime operator-(FX_UNITIME t1, const CFX_Unitime& t2) {
     return CFX_Unitime(t1 + t2.m_iUnitime);
   }
-  friend FX_BOOL operator==(const CFX_Unitime& t1, const CFX_Unitime& t2) {
+  friend bool operator==(const CFX_Unitime& t1, const CFX_Unitime& t2) {
     return t1.m_iUnitime == t2.m_iUnitime;
   }
-  friend FX_BOOL operator==(const CFX_Unitime& t1, FX_UNITIME t2) {
+  friend bool operator==(const CFX_Unitime& t1, FX_UNITIME t2) {
     return t1.m_iUnitime == t2;
   }
-  friend FX_BOOL operator==(FX_UNITIME t1, const CFX_Unitime& t2) {
+  friend bool operator==(FX_UNITIME t1, const CFX_Unitime& t2) {
     return t1 == t2.m_iUnitime;
   }
-  friend FX_BOOL operator!=(const CFX_Unitime& t1, const CFX_Unitime& t2) {
+  friend bool operator!=(const CFX_Unitime& t1, const CFX_Unitime& t2) {
     return t1.m_iUnitime != t2.m_iUnitime;
   }
-  friend FX_BOOL operator!=(const CFX_Unitime& t1, FX_UNITIME t2) {
+  friend bool operator!=(const CFX_Unitime& t1, FX_UNITIME t2) {
     return t1.m_iUnitime != t2;
   }
-  friend FX_BOOL operator!=(FX_UNITIME t1, const CFX_Unitime& t2) {
+  friend bool operator!=(FX_UNITIME t1, const CFX_Unitime& t2) {
     return t1 != t2.m_iUnitime;
   }
-  friend FX_BOOL operator>(const CFX_Unitime& t1, const CFX_Unitime& t2) {
+  friend bool operator>(const CFX_Unitime& t1, const CFX_Unitime& t2) {
     return t1.m_iUnitime > t2.m_iUnitime;
   }
-  friend FX_BOOL operator>(const CFX_Unitime& t1, FX_UNITIME t2) {
+  friend bool operator>(const CFX_Unitime& t1, FX_UNITIME t2) {
     return t1.m_iUnitime > t2;
   }
-  friend FX_BOOL operator>(FX_UNITIME t1, const CFX_Unitime& t2) {
+  friend bool operator>(FX_UNITIME t1, const CFX_Unitime& t2) {
     return t1 > t2.m_iUnitime;
   }
-  friend FX_BOOL operator>=(const CFX_Unitime& t1, const CFX_Unitime& t2) {
+  friend bool operator>=(const CFX_Unitime& t1, const CFX_Unitime& t2) {
     return t1.m_iUnitime >= t2.m_iUnitime;
   }
-  friend FX_BOOL operator>=(const CFX_Unitime& t1, FX_UNITIME t2) {
+  friend bool operator>=(const CFX_Unitime& t1, FX_UNITIME t2) {
     return t1.m_iUnitime >= t2;
   }
-  friend FX_BOOL operator>=(FX_UNITIME t1, const CFX_Unitime& t2) {
+  friend bool operator>=(FX_UNITIME t1, const CFX_Unitime& t2) {
     return t1 >= t2.m_iUnitime;
   }
-  friend FX_BOOL operator<(const CFX_Unitime& t1, const CFX_Unitime& t2) {
+  friend bool operator<(const CFX_Unitime& t1, const CFX_Unitime& t2) {
     return t1.m_iUnitime < t2.m_iUnitime;
   }
-  friend FX_BOOL operator<(const CFX_Unitime& t1, FX_UNITIME t2) {
+  friend bool operator<(const CFX_Unitime& t1, FX_UNITIME t2) {
     return t1.m_iUnitime < t2;
   }
-  friend FX_BOOL operator<(FX_UNITIME t1, const CFX_Unitime& t2) {
+  friend bool operator<(FX_UNITIME t1, const CFX_Unitime& t2) {
     return t1 < t2.m_iUnitime;
   }
-  friend FX_BOOL operator<=(const CFX_Unitime& t1, const CFX_Unitime& t2) {
+  friend bool operator<=(const CFX_Unitime& t1, const CFX_Unitime& t2) {
     return t1.m_iUnitime <= t2.m_iUnitime;
   }
-  friend FX_BOOL operator<=(const CFX_Unitime& t1, FX_UNITIME t2) {
+  friend bool operator<=(const CFX_Unitime& t1, FX_UNITIME t2) {
     return t1.m_iUnitime <= t2;
   }
-  friend FX_BOOL operator<=(FX_UNITIME t1, const CFX_Unitime& t2) {
+  friend bool operator<=(FX_UNITIME t1, const CFX_Unitime& t2) {
     return t1 <= t2.m_iUnitime;
   }
 
diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h
index 78c9b5ee13..efb1b03b33 100644
--- a/xfa/src/fgas/include/fx_fnt.h
+++ b/xfa/src/fgas/include/fx_fnt.h
@@ -123,8 +123,8 @@ typedef struct _FX_FONTDESCRIPTOR : public CFX_Target {
 } FX_FONTDESCRIPTOR, *FX_LPFONTDESCRIPTOR;
 typedef FX_FONTDESCRIPTOR const* FX_LPCFONTDESCRIPTOR;
 typedef CFX_MassArrayTemplate<FX_FONTDESCRIPTOR> CFX_FontDescriptors;
-inline FX_BOOL operator==(const FX_FONTDESCRIPTOR& left,
-                          const FX_FONTDESCRIPTOR& right) {
+inline bool operator==(const FX_FONTDESCRIPTOR& left,
+                       const FX_FONTDESCRIPTOR& right) {
   return left.uCharSet == right.uCharSet &&
          left.dwFontStyles == right.dwFontStyles &&
          FXSYS_wcscmp(left.wsFontFace, right.wsFontFace) == 0 &&
diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h
index cf35491f9b..c558af62d0 100644
--- a/xfa/src/fgas/include/fx_locale.h
+++ b/xfa/src/fgas/include/fx_locale.h
@@ -164,12 +164,12 @@ class CFX_Decimal {
   CFX_Decimal(const CFX_ByteStringC& str);
   operator CFX_WideString() const;
   operator double() const;
-  FX_BOOL operator==(const CFX_Decimal& val) const;
-  FX_BOOL operator<=(const CFX_Decimal& val) const;
-  FX_BOOL operator>=(const CFX_Decimal& val) const;
-  FX_BOOL operator!=(const CFX_Decimal& val) const;
-  FX_BOOL operator<(const CFX_Decimal& val) const;
-  FX_BOOL operator>(const CFX_Decimal& val) const;
+  bool operator==(const CFX_Decimal& val) const;
+  bool operator<=(const CFX_Decimal& val) const;
+  bool operator>=(const CFX_Decimal& val) const;
+  bool operator!=(const CFX_Decimal& val) const;
+  bool operator<(const CFX_Decimal& val) const;
+  bool operator>(const CFX_Decimal& val) const;
   CFX_Decimal operator+(const CFX_Decimal& val) const;
   CFX_Decimal operator-(const CFX_Decimal& val) const;
   CFX_Decimal operator*(const CFX_Decimal& val) const;
diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h
index e95d82005a..8ce736569d 100644
--- a/xfa/src/fgas/include/fx_utl.h
+++ b/xfa/src/fgas/include/fx_utl.h
@@ -664,7 +664,7 @@ class CFX_CPLTreeNode : public CFX_Target {
     }
     return iLevel;
   }
-  FX_BOOL IsRootNode() const { return m_pParentNode == NULL; }
+  bool IsRootNode() const { return !m_pParentNode; }
   baseType GetData() const { return m_Data; }
   void SetData(baseType data) { m_Data = data; }
 
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h
index 55359de829..de0291e2ef 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.h
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h
@@ -102,13 +102,13 @@ struct FX_FontDescriptorInfo {
  public:
   CFX_FontDescriptor* pFont;
   int32_t nPenalty;
-  FX_BOOL operator>(const FX_FontDescriptorInfo& x) {
+  bool operator>(const FX_FontDescriptorInfo& x) {
     return nPenalty > x.nPenalty;
   };
-  FX_BOOL operator<(const FX_FontDescriptorInfo& x) {
+  bool operator<(const FX_FontDescriptorInfo& x) {
     return nPenalty < x.nPenalty;
   };
-  FX_BOOL operator==(const FX_FontDescriptorInfo& x) {
+  bool operator==(const FX_FontDescriptorInfo& x) {
     return nPenalty == x.nPenalty;
   };
 };
diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp
index ca12dbb69e..fe9ec3f8dd 100644
--- a/xfa/src/fgas/src/localization/fx_locale.cpp
+++ b/xfa/src/fgas/src/localization/fx_locale.cpp
@@ -4980,9 +4980,8 @@ CFX_Decimal CFX_Decimal::AddOrMinus(const CFX_Decimal& val,
   if (!isAdding) {
     rhs.SetNegate();
   }
-  FX_BOOL doRawAdd = (FXMATH_DECIMAL_FLAGS2NEG(lhs.m_uFlags) ==
-                      FXMATH_DECIMAL_FLAGS2NEG(rhs.m_uFlags));
-  if (doRawAdd) {
+  if (FXMATH_DECIMAL_FLAGS2NEG(lhs.m_uFlags) ==
+      FXMATH_DECIMAL_FLAGS2NEG(rhs.m_uFlags)) {
     uint64_t phi = lhs.m_uHi, pmid = lhs.m_uMid, plo = lhs.m_uLo;
     phi += rhs.m_uHi;
     pmid += rhs.m_uMid;
@@ -5087,22 +5086,22 @@ CFX_Decimal CFX_Decimal::Modulus(const CFX_Decimal& val) const {
   }
   return lhs;
 }
-FX_BOOL CFX_Decimal::operator==(const CFX_Decimal& val) const {
+bool CFX_Decimal::operator==(const CFX_Decimal& val) const {
   return Compare(val) == 0;
 }
-FX_BOOL CFX_Decimal::operator<=(const CFX_Decimal& val) const {
+bool CFX_Decimal::operator<=(const CFX_Decimal& val) const {
   return Compare(val) <= 0;
 }
-FX_BOOL CFX_Decimal::operator>=(const CFX_Decimal& val) const {
+bool CFX_Decimal::operator>=(const CFX_Decimal& val) const {
   return Compare(val) >= 0;
 }
-FX_BOOL CFX_Decimal::operator!=(const CFX_Decimal& val) const {
+bool CFX_Decimal::operator!=(const CFX_Decimal& val) const {
   return Compare(val) != 0;
 }
-FX_BOOL CFX_Decimal::operator<(const CFX_Decimal& val) const {
+bool CFX_Decimal::operator<(const CFX_Decimal& val) const {
   return Compare(val) < 0;
 }
-FX_BOOL CFX_Decimal::operator>(const CFX_Decimal& val) const {
+bool CFX_Decimal::operator>(const CFX_Decimal& val) const {
   return Compare(val) > 0;
 }
 CFX_Decimal CFX_Decimal::operator+(const CFX_Decimal& val) const {