Remove FX_BOOL from xfa.

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

13 files changed, 83 insertions, 83 deletions

diff --git a/xfa/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/xfa/fxbarcode/datamatrix/BC_Base256Encoder.cpp
index 98e7848ce8..b8e427c7fc 100644
--- a/xfa/fxbarcode/datamatrix/BC_Base256Encoder.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_Base256Encoder.cpp
@@ -58,7 +58,7 @@ void CBC_Base256Encoder::Encode(CBC_EncoderContext& context, int32_t& e) {
   if (e != BCExceptionNO) {
     return;
   }
-  FX_BOOL mustPad = (context.m_symbolInfo->m_dataCapacity - currentSize) > 0;
+  bool mustPad = (context.m_symbolInfo->m_dataCapacity - currentSize) > 0;
   if (context.hasMoreCharacters() || mustPad) {
     if (dataCount <= 249) {
       buffer.SetAt(0, (FX_WCHAR)dataCount);
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
index 16c253f062..e580bb583f 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
@@ -26,7 +26,7 @@
 #include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 CBC_DataMatrixSymbolInfo144::CBC_DataMatrixSymbolInfo144()
-    : CBC_SymbolInfo(FALSE, 1558, 620, 22, 22, 36) {
+    : CBC_SymbolInfo(false, 1558, 620, 22, 22, 36) {
   m_rsBlockData = -1;
   m_rsBlockError = 62;
 }
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
index 6263b7fbe5..1fe8018631 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
@@ -44,9 +44,9 @@
 
 CBC_DataMatrixWriter::CBC_DataMatrixWriter() {}
 CBC_DataMatrixWriter::~CBC_DataMatrixWriter() {}
-FX_BOOL CBC_DataMatrixWriter::SetErrorCorrectionLevel(int32_t level) {
+bool CBC_DataMatrixWriter::SetErrorCorrectionLevel(int32_t level) {
   m_iCorrectLevel = level;
-  return TRUE;
+  return true;
 }
 uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString& contents,
                                       int32_t& outWidth,
@@ -65,7 +65,7 @@ uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString& contents,
       contents, ecLevel, shape, minSize, maxSize, e);
   BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
   CBC_SymbolInfo* symbolInfo = CBC_SymbolInfo::lookup(
-      encoded.GetLength(), shape, minSize, maxSize, TRUE, e);
+      encoded.GetLength(), shape, minSize, maxSize, true, e);
   BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
   CFX_WideString codewords =
       CBC_ErrorCorrection::encodeECC200(encoded, symbolInfo, e);
@@ -111,7 +111,7 @@ CBC_CommonByteMatrix* CBC_DataMatrixWriter::encodeLowLevel(
     matrixX = 0;
     for (int32_t x = 0; x < symbolWidth; x++) {
       if ((x % symbolInfo->m_matrixWidth) == 0) {
-        matrix->Set(matrixX, matrixY, TRUE);
+        matrix->Set(matrixX, matrixY, true);
         matrixX++;
       }
       matrix->Set(matrixX, matrixY, placement->getBit(x, y));
@@ -125,7 +125,7 @@ CBC_CommonByteMatrix* CBC_DataMatrixWriter::encodeLowLevel(
     if ((y % symbolInfo->m_matrixHeight) == symbolInfo->m_matrixHeight - 1) {
       matrixX = 0;
       for (int32_t x = 0; x < symbolInfo->getSymbolWidth(e); x++) {
-        matrix->Set(matrixX, matrixY, TRUE);
+        matrix->Set(matrixX, matrixY, true);
         matrixX++;
       }
       matrixY++;
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h
index 1196e46352..af1417b588 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h
+++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h
@@ -24,7 +24,7 @@ class CBC_DataMatrixWriter : public CBC_TwoDimWriter {
                           int32_t& e);
 
   // CBC_TwoDimWriter
-  FX_BOOL SetErrorCorrectionLevel(int32_t level) override;
+  bool SetErrorCorrectionLevel(int32_t level) override;
 
  private:
   static CBC_CommonByteMatrix* encodeLowLevel(CBC_DefaultPlacement* placement,
diff --git a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.cpp b/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
index 830df224ca..bc0aa72b42 100644
--- a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
@@ -46,13 +46,13 @@ int32_t CBC_DefaultPlacement::getNumcols() {
 CFX_ByteArray& CBC_DefaultPlacement::getBits() {
   return m_bits;
 }
-FX_BOOL CBC_DefaultPlacement::getBit(int32_t col, int32_t row) {
+bool CBC_DefaultPlacement::getBit(int32_t col, int32_t row) {
   return m_bits[row * m_numcols + col] == 1;
 }
-void CBC_DefaultPlacement::setBit(int32_t col, int32_t row, FX_BOOL bit) {
+void CBC_DefaultPlacement::setBit(int32_t col, int32_t row, bool bit) {
   m_bits[row * m_numcols + col] = bit ? (uint8_t)1 : (uint8_t)0;
 }
-FX_BOOL CBC_DefaultPlacement::hasBit(int32_t col, int32_t row) {
+bool CBC_DefaultPlacement::hasBit(int32_t col, int32_t row) {
   return m_bits[row * m_numcols + col] != 2;
 }
 void CBC_DefaultPlacement::place() {
@@ -92,8 +92,8 @@ void CBC_DefaultPlacement::place() {
     col++;
   } while ((row < m_numrows) || (col < m_numcols));
   if (!hasBit(m_numcols - 1, m_numrows - 1)) {
-    setBit(m_numcols - 1, m_numrows - 1, TRUE);
-    setBit(m_numcols - 2, m_numrows - 2, TRUE);
+    setBit(m_numcols - 1, m_numrows - 1, true);
+    setBit(m_numcols - 2, m_numrows - 2, true);
   }
 }
 void CBC_DefaultPlacement::module(int32_t row,
diff --git a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h b/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h
index f9b44621b1..64d02886f7 100644
--- a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h
+++ b/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h
@@ -19,9 +19,9 @@ class CBC_DefaultPlacement {
   int32_t getNumrows();
   int32_t getNumcols();
   CFX_ByteArray& getBits();
-  FX_BOOL getBit(int32_t col, int32_t row);
-  void setBit(int32_t col, int32_t row, FX_BOOL bit);
-  FX_BOOL hasBit(int32_t col, int32_t row);
+  bool getBit(int32_t col, int32_t row);
+  void setBit(int32_t col, int32_t row, bool bit);
+  bool hasBit(int32_t col, int32_t row);
   void place();
 
  private:
diff --git a/xfa/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
index e1d493a1ca..7db117d003 100644
--- a/xfa/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
@@ -89,8 +89,8 @@ void CBC_EdifactEncoder::handleEOD(CBC_EncoderContext& context,
   if (e != BCExceptionNO) {
     return;
   }
-  FX_BOOL endOfSymbolReached = !context.hasMoreCharacters();
-  FX_BOOL restInAscii = endOfSymbolReached && restChars <= 2;
+  bool endOfSymbolReached = !context.hasMoreCharacters();
+  bool restInAscii = endOfSymbolReached && restChars <= 2;
   if (restChars <= 2) {
     context.updateSymbolInfo(context.getCodewordCount() + restChars, e);
     if (e != BCExceptionNO) {
@@ -99,7 +99,7 @@ void CBC_EdifactEncoder::handleEOD(CBC_EncoderContext& context,
     int32_t available =
         context.m_symbolInfo->m_dataCapacity - context.getCodewordCount();
     if (available >= 3) {
-      restInAscii = FALSE;
+      restInAscii = false;
       context.updateSymbolInfo(context.getCodewordCount() + encoded.GetLength(),
                                e);
       if (e != BCExceptionNO) {
diff --git a/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp b/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp
index 6e395837d4..c395f3a914 100644
--- a/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp
@@ -87,7 +87,7 @@ void CBC_EncoderContext::signalEncoderChange(int32_t encoding) {
 void CBC_EncoderContext::resetEncoderSignal() {
   m_newEncoding = -1;
 }
-FX_BOOL CBC_EncoderContext::hasMoreCharacters() {
+bool CBC_EncoderContext::hasMoreCharacters() {
   return m_pos < getTotalMessageCharCount();
 }
 int32_t CBC_EncoderContext::getRemainingCharacters() {
diff --git a/xfa/fxbarcode/datamatrix/BC_EncoderContext.h b/xfa/fxbarcode/datamatrix/BC_EncoderContext.h
index 0c1c8a6547..8d0ea5d7ed 100644
--- a/xfa/fxbarcode/datamatrix/BC_EncoderContext.h
+++ b/xfa/fxbarcode/datamatrix/BC_EncoderContext.h
@@ -30,7 +30,7 @@ class CBC_EncoderContext : public CBC_SymbolShapeHint {
   int32_t getCodewordCount();
   void signalEncoderChange(int32_t encoding);
   void resetEncoderSignal();
-  FX_BOOL hasMoreCharacters();
+  bool hasMoreCharacters();
   int32_t getRemainingCharacters();
   void updateSymbolInfo(int32_t& e);
   void updateSymbolInfo(int32_t len, int32_t& e);
diff --git a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
index 7fcc039721..7d81c93418 100644
--- a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
@@ -156,7 +156,7 @@ int32_t CBC_HighLevelEncoder::lookAheadTest(CFX_WideString msg,
     charCounts[currentMode] = 0;
   }
   int32_t charsProcessed = 0;
-  while (TRUE) {
+  while (true) {
     if ((startpos + charsProcessed) == msg.GetLength()) {
       int32_t min = std::numeric_limits<int32_t>::max();
       CFX_ByteArray mins;
@@ -284,10 +284,10 @@ int32_t CBC_HighLevelEncoder::lookAheadTest(CFX_WideString msg,
     }
   }
 }
-FX_BOOL CBC_HighLevelEncoder::isDigit(FX_WCHAR ch) {
+bool CBC_HighLevelEncoder::isDigit(FX_WCHAR ch) {
   return ch >= '0' && ch <= '9';
 }
-FX_BOOL CBC_HighLevelEncoder::isExtendedASCII(FX_WCHAR ch) {
+bool CBC_HighLevelEncoder::isExtendedASCII(FX_WCHAR ch) {
   return ch >= 128 && ch <= 255;
 }
 int32_t CBC_HighLevelEncoder::determineConsecutiveDigitCount(CFX_WideString msg,
@@ -346,22 +346,22 @@ int32_t CBC_HighLevelEncoder::getMinimumCount(CFX_ByteArray& mins) {
   }
   return minCount;
 }
-FX_BOOL CBC_HighLevelEncoder::isNativeC40(FX_WCHAR ch) {
+bool CBC_HighLevelEncoder::isNativeC40(FX_WCHAR ch) {
   return (ch == ' ') || (ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'Z');
 }
-FX_BOOL CBC_HighLevelEncoder::isNativeText(FX_WCHAR ch) {
+bool CBC_HighLevelEncoder::isNativeText(FX_WCHAR ch) {
   return (ch == ' ') || (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z');
 }
-FX_BOOL CBC_HighLevelEncoder::isNativeX12(FX_WCHAR ch) {
+bool CBC_HighLevelEncoder::isNativeX12(FX_WCHAR ch) {
   return isX12TermSep(ch) || (ch == ' ') || (ch >= '0' && ch <= '9') ||
          (ch >= 'A' && ch <= 'Z');
 }
-FX_BOOL CBC_HighLevelEncoder::isX12TermSep(FX_WCHAR ch) {
+bool CBC_HighLevelEncoder::isX12TermSep(FX_WCHAR ch) {
   return (ch == '\r') || (ch == '*') || (ch == '>');
 }
-FX_BOOL CBC_HighLevelEncoder::isNativeEDIFACT(FX_WCHAR ch) {
+bool CBC_HighLevelEncoder::isNativeEDIFACT(FX_WCHAR ch) {
   return ch >= ' ' && ch <= '^';
 }
-FX_BOOL CBC_HighLevelEncoder::isSpecialB256(FX_WCHAR ch) {
-  return FALSE;
+bool CBC_HighLevelEncoder::isSpecialB256(FX_WCHAR ch) {
+  return false;
 }
diff --git a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h b/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h
index 550b601e53..cf04c06619 100644
--- a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h
+++ b/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h
@@ -34,8 +34,8 @@ class CBC_HighLevelEncoder : public CBC_SymbolShapeHint {
   static int32_t lookAheadTest(CFX_WideString msg,
                                int32_t startpos,
                                int32_t currentMode);
-  static FX_BOOL isDigit(FX_WCHAR ch);
-  static FX_BOOL isExtendedASCII(FX_WCHAR ch);
+  static bool isDigit(FX_WCHAR ch);
+  static bool isExtendedASCII(FX_WCHAR ch);
   static int32_t determineConsecutiveDigitCount(CFX_WideString msg,
                                                 int32_t startpos);
   static void illegalCharacter(FX_WCHAR c, int32_t& e);
@@ -66,12 +66,12 @@ class CBC_HighLevelEncoder : public CBC_SymbolShapeHint {
                               int32_t min,
                               CFX_ByteArray& mins);
   static int32_t getMinimumCount(CFX_ByteArray& mins);
-  static FX_BOOL isNativeC40(FX_WCHAR ch);
-  static FX_BOOL isNativeText(FX_WCHAR ch);
-  static FX_BOOL isNativeX12(FX_WCHAR ch);
-  static FX_BOOL isX12TermSep(FX_WCHAR ch);
-  static FX_BOOL isNativeEDIFACT(FX_WCHAR ch);
-  static FX_BOOL isSpecialB256(FX_WCHAR ch);
+  static bool isNativeC40(FX_WCHAR ch);
+  static bool isNativeText(FX_WCHAR ch);
+  static bool isNativeX12(FX_WCHAR ch);
+  static bool isX12TermSep(FX_WCHAR ch);
+  static bool isNativeEDIFACT(FX_WCHAR ch);
+  static bool isSpecialB256(FX_WCHAR ch);
 };
 
 #endif  // XFA_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp
index b6323041f9..77a809a511 100644
--- a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp
@@ -41,35 +41,35 @@ CBC_SymbolInfo* g_symbols[kSymbolsCount] = {
 }  // namespace
 
 void CBC_SymbolInfo::Initialize() {
-  g_symbols[0] = new CBC_SymbolInfo(FALSE, 3, 5, 8, 8, 1);
-  g_symbols[1] = new CBC_SymbolInfo(FALSE, 5, 7, 10, 10, 1);
-  g_symbols[2] = new CBC_SymbolInfo(TRUE, 5, 7, 16, 6, 1);
-  g_symbols[3] = new CBC_SymbolInfo(FALSE, 8, 10, 12, 12, 1);
-  g_symbols[4] = new CBC_SymbolInfo(TRUE, 10, 11, 14, 6, 2);
-  g_symbols[5] = new CBC_SymbolInfo(FALSE, 12, 12, 14, 14, 1);
-  g_symbols[6] = new CBC_SymbolInfo(TRUE, 16, 14, 24, 10, 1);
-  g_symbols[7] = new CBC_SymbolInfo(FALSE, 18, 14, 16, 16, 1);
-  g_symbols[8] = new CBC_SymbolInfo(FALSE, 22, 18, 18, 18, 1);
-  g_symbols[9] = new CBC_SymbolInfo(TRUE, 22, 18, 16, 10, 2);
-  g_symbols[10] = new CBC_SymbolInfo(FALSE, 30, 20, 20, 20, 1);
-  g_symbols[11] = new CBC_SymbolInfo(TRUE, 32, 24, 16, 14, 2);
-  g_symbols[12] = new CBC_SymbolInfo(FALSE, 36, 24, 22, 22, 1);
-  g_symbols[13] = new CBC_SymbolInfo(FALSE, 44, 28, 24, 24, 1);
-  g_symbols[14] = new CBC_SymbolInfo(TRUE, 49, 28, 22, 14, 2);
-  g_symbols[15] = new CBC_SymbolInfo(FALSE, 62, 36, 14, 14, 4);
-  g_symbols[16] = new CBC_SymbolInfo(FALSE, 86, 42, 16, 16, 4);
-  g_symbols[17] = new CBC_SymbolInfo(FALSE, 114, 48, 18, 18, 4);
-  g_symbols[18] = new CBC_SymbolInfo(FALSE, 144, 56, 20, 20, 4);
-  g_symbols[19] = new CBC_SymbolInfo(FALSE, 174, 68, 22, 22, 4);
-  g_symbols[20] = new CBC_SymbolInfo(FALSE, 204, 84, 24, 24, 4, 102, 42);
-  g_symbols[21] = new CBC_SymbolInfo(FALSE, 280, 112, 14, 14, 16, 140, 56);
-  g_symbols[22] = new CBC_SymbolInfo(FALSE, 368, 144, 16, 16, 16, 92, 36);
-  g_symbols[23] = new CBC_SymbolInfo(FALSE, 456, 192, 18, 18, 16, 114, 48);
-  g_symbols[24] = new CBC_SymbolInfo(FALSE, 576, 224, 20, 20, 16, 144, 56);
-  g_symbols[25] = new CBC_SymbolInfo(FALSE, 696, 272, 22, 22, 16, 174, 68);
-  g_symbols[26] = new CBC_SymbolInfo(FALSE, 816, 336, 24, 24, 16, 136, 56);
-  g_symbols[27] = new CBC_SymbolInfo(FALSE, 1050, 408, 18, 18, 36, 175, 68);
-  g_symbols[28] = new CBC_SymbolInfo(FALSE, 1304, 496, 20, 20, 36, 163, 62);
+  g_symbols[0] = new CBC_SymbolInfo(false, 3, 5, 8, 8, 1);
+  g_symbols[1] = new CBC_SymbolInfo(false, 5, 7, 10, 10, 1);
+  g_symbols[2] = new CBC_SymbolInfo(true, 5, 7, 16, 6, 1);
+  g_symbols[3] = new CBC_SymbolInfo(false, 8, 10, 12, 12, 1);
+  g_symbols[4] = new CBC_SymbolInfo(true, 10, 11, 14, 6, 2);
+  g_symbols[5] = new CBC_SymbolInfo(false, 12, 12, 14, 14, 1);
+  g_symbols[6] = new CBC_SymbolInfo(true, 16, 14, 24, 10, 1);
+  g_symbols[7] = new CBC_SymbolInfo(false, 18, 14, 16, 16, 1);
+  g_symbols[8] = new CBC_SymbolInfo(false, 22, 18, 18, 18, 1);
+  g_symbols[9] = new CBC_SymbolInfo(true, 22, 18, 16, 10, 2);
+  g_symbols[10] = new CBC_SymbolInfo(false, 30, 20, 20, 20, 1);
+  g_symbols[11] = new CBC_SymbolInfo(true, 32, 24, 16, 14, 2);
+  g_symbols[12] = new CBC_SymbolInfo(false, 36, 24, 22, 22, 1);
+  g_symbols[13] = new CBC_SymbolInfo(false, 44, 28, 24, 24, 1);
+  g_symbols[14] = new CBC_SymbolInfo(true, 49, 28, 22, 14, 2);
+  g_symbols[15] = new CBC_SymbolInfo(false, 62, 36, 14, 14, 4);
+  g_symbols[16] = new CBC_SymbolInfo(false, 86, 42, 16, 16, 4);
+  g_symbols[17] = new CBC_SymbolInfo(false, 114, 48, 18, 18, 4);
+  g_symbols[18] = new CBC_SymbolInfo(false, 144, 56, 20, 20, 4);
+  g_symbols[19] = new CBC_SymbolInfo(false, 174, 68, 22, 22, 4);
+  g_symbols[20] = new CBC_SymbolInfo(false, 204, 84, 24, 24, 4, 102, 42);
+  g_symbols[21] = new CBC_SymbolInfo(false, 280, 112, 14, 14, 16, 140, 56);
+  g_symbols[22] = new CBC_SymbolInfo(false, 368, 144, 16, 16, 16, 92, 36);
+  g_symbols[23] = new CBC_SymbolInfo(false, 456, 192, 18, 18, 16, 114, 48);
+  g_symbols[24] = new CBC_SymbolInfo(false, 576, 224, 20, 20, 16, 144, 56);
+  g_symbols[25] = new CBC_SymbolInfo(false, 696, 272, 22, 22, 16, 174, 68);
+  g_symbols[26] = new CBC_SymbolInfo(false, 816, 336, 24, 24, 16, 136, 56);
+  g_symbols[27] = new CBC_SymbolInfo(false, 1050, 408, 18, 18, 36, 175, 68);
+  g_symbols[28] = new CBC_SymbolInfo(false, 1304, 496, 20, 20, 36, 163, 62);
   g_symbols[29] = new CBC_DataMatrixSymbolInfo144();
 }
 
@@ -80,7 +80,7 @@ void CBC_SymbolInfo::Finalize() {
   }
 }
 
-CBC_SymbolInfo::CBC_SymbolInfo(FX_BOOL rectangular,
+CBC_SymbolInfo::CBC_SymbolInfo(bool rectangular,
                                int32_t dataCapacity,
                                int32_t errorCodewords,
                                int32_t matrixWidth,
@@ -95,7 +95,7 @@ CBC_SymbolInfo::CBC_SymbolInfo(FX_BOOL rectangular,
   m_rsBlockData = dataCapacity;
   m_rsBlockError = errorCodewords;
 }
-CBC_SymbolInfo::CBC_SymbolInfo(FX_BOOL rectangular,
+CBC_SymbolInfo::CBC_SymbolInfo(bool rectangular,
                                int32_t dataCapacity,
                                int32_t errorCodewords,
                                int32_t matrixWidth,
@@ -115,23 +115,23 @@ CBC_SymbolInfo::CBC_SymbolInfo(FX_BOOL rectangular,
 CBC_SymbolInfo::~CBC_SymbolInfo() {}
 
 CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords, int32_t& e) {
-  return lookup(dataCodewords, FORCE_NONE, TRUE, e);
+  return lookup(dataCodewords, FORCE_NONE, true, e);
 }
 CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
                                        SymbolShapeHint shape,
                                        int32_t& e) {
-  return lookup(dataCodewords, shape, TRUE, e);
+  return lookup(dataCodewords, shape, true, e);
 }
 CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
-                                       FX_BOOL allowRectangular,
-                                       FX_BOOL fail,
+                                       bool allowRectangular,
+                                       bool fail,
                                        int32_t& e) {
   SymbolShapeHint shape = allowRectangular ? FORCE_NONE : FORCE_SQUARE;
   return lookup(dataCodewords, shape, fail, e);
 }
 CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
                                        SymbolShapeHint shape,
-                                       FX_BOOL fail,
+                                       bool fail,
                                        int32_t& e) {
   return lookup(dataCodewords, shape, nullptr, nullptr, fail, e);
 }
@@ -139,7 +139,7 @@ CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
                                        SymbolShapeHint shape,
                                        CBC_Dimension* minSize,
                                        CBC_Dimension* maxSize,
-                                       FX_BOOL fail,
+                                       bool fail,
                                        int32_t& e) {
   for (size_t i = 0; i < kSymbolsCount; i++) {
     CBC_SymbolInfo* symbol = g_symbols[i];
diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h
index b5778d5a3a..d2730025db 100644
--- a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h
+++ b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h
@@ -15,7 +15,7 @@ class CBC_Dimension;
 
 class CBC_SymbolInfo : public CBC_SymbolShapeHint {
  public:
-  CBC_SymbolInfo(FX_BOOL rectangular,
+  CBC_SymbolInfo(bool rectangular,
                  int32_t dataCapacity,
                  int32_t errorCodewords,
                  int32_t matrixWidth,
@@ -31,18 +31,18 @@ class CBC_SymbolInfo : public CBC_SymbolShapeHint {
                                 SymbolShapeHint shape,
                                 int32_t& e);
   static CBC_SymbolInfo* lookup(int32_t dataCodewords,
-                                FX_BOOL allowRectangular,
-                                FX_BOOL fail,
+                                bool allowRectangular,
+                                bool fail,
                                 int32_t& e);
   static CBC_SymbolInfo* lookup(int32_t dataCodewords,
                                 SymbolShapeHint shape,
-                                FX_BOOL fail,
+                                bool fail,
                                 int32_t& e);
   static CBC_SymbolInfo* lookup(int32_t dataCodewords,
                                 SymbolShapeHint shape,
                                 CBC_Dimension* minSize,
                                 CBC_Dimension* maxSize,
-                                FX_BOOL fail,
+                                bool fail,
                                 int32_t& e);
   int32_t getHorizontalDataRegions(int32_t& e);
   int32_t getVerticalDataRegions(int32_t& e);
@@ -63,7 +63,7 @@ class CBC_SymbolInfo : public CBC_SymbolShapeHint {
   int32_t m_rsBlockError;
 
  private:
-  CBC_SymbolInfo(FX_BOOL rectangular,
+  CBC_SymbolInfo(bool rectangular,
                  int32_t dataCapacity,
                  int32_t errorCodewords,
                  int32_t matrixWidth,
@@ -72,7 +72,7 @@ class CBC_SymbolInfo : public CBC_SymbolShapeHint {
                  int32_t rsBlockData,
                  int32_t rsBlockError);
 
-  FX_BOOL m_rectangular;
+  bool m_rectangular;
   int32_t m_dataRegions;
 };