Remove FX_DWORD from XFA.

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

6 files changed, 17 insertions, 17 deletions

diff --git a/xfa/fxbarcode/BC_Utils.cpp b/xfa/fxbarcode/BC_Utils.cpp
index b69b4d251d..2225f7ce50 100644
--- a/xfa/fxbarcode/BC_Utils.cpp
+++ b/xfa/fxbarcode/BC_Utils.cpp
@@ -8,8 +8,8 @@
 #include "xfa/fxbarcode/utils.h"
 
 FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst,
-                                 FX_DWORD first,
-                                 FX_DWORD last,
+                                 uint32_t first,
+                                 uint32_t last,
                                  int32_t count,
                                  FX_CHAR c) {
   if (first > last || count <= 0) {
diff --git a/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp
index a8f87e7ec4..4fff7b1a84 100644
--- a/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp
+++ b/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp
@@ -54,7 +54,7 @@ FX_BOOL CBC_CommonBitMatrix::Get(int32_t x, int32_t y) {
   if (offset >= m_rowSize * m_height || offset < 0) {
     return false;
   }
-  return ((((FX_DWORD)m_bits[offset]) >> (x & 0x1f)) & 1) != 0;
+  return ((((uint32_t)m_bits[offset]) >> (x & 0x1f)) & 1) != 0;
 }
 int32_t* CBC_CommonBitMatrix::GetBits() {
   return m_bits;
diff --git a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
index d8e7bb1dc5..1f7c4c3453 100644
--- a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
+++ b/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
@@ -166,7 +166,7 @@ int32_t CBC_HighLevelEncoder::lookAheadTest(CFX_WideString msg,
   int32_t charsProcessed = 0;
   while (TRUE) {
     if ((startpos + charsProcessed) == msg.GetLength()) {
-      FX_DWORD min = std::numeric_limits<int32_t>::max();
+      uint32_t min = std::numeric_limits<int32_t>::max();
       CFX_ByteArray mins;
       mins.SetSize(6);
       CFX_Int32Array intCharCounts;
diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp
index 62ca97f488..b95c2be283 100644
--- a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -133,7 +133,7 @@ void CBC_OneDimWriter::CalcTextInfo(const CFX_ByteString& text,
       FX_CreateFontEncodingEx(cFont));
 
   int32_t length = text.GetLength();
-  FX_DWORD* pCharCode = FX_Alloc(FX_DWORD, text.GetLength());
+  uint32_t* pCharCode = FX_Alloc(uint32_t, text.GetLength());
   FX_FLOAT charWidth = 0;
   for (int32_t j = 0; j < text.GetLength(); j++) {
     pCharCode[j] = encoding->CharCodeFromUnicode(text[j]);
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Common.cpp b/xfa/fxbarcode/pdf417/BC_PDF417Common.cpp
index 92c641d1bd..b9cac0c678 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Common.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417Common.cpp
@@ -620,22 +620,22 @@ int32_t CBC_PDF417Common::getBitCountSum(CFX_Int32Array& moduleBitCount) {
   }
   return bitCountSum;
 }
-int32_t CBC_PDF417Common::getCodeword(FX_DWORD symbol) {
-  FX_DWORD sym = symbol & 0x3FFFF;
+int32_t CBC_PDF417Common::getCodeword(uint32_t symbol) {
+  uint32_t sym = symbol & 0x3FFFF;
   int32_t i = findCodewordIndex(sym);
   if (i == -1) {
     return -1;
   }
   return (CODEWORD_TABLE[i] - 1) % NUMBER_OF_CODEWORDS;
 }
-int32_t CBC_PDF417Common::findCodewordIndex(FX_DWORD symbol) {
+int32_t CBC_PDF417Common::findCodewordIndex(uint32_t symbol) {
   int32_t first = 0;
   int32_t upto = sizeof(SYMBOL_TABLE) / sizeof(SYMBOL_TABLE[0]);
   while (first < upto) {
-    int32_t mid = ((FX_DWORD)(first + upto)) >> 1;
-    if (symbol < (FX_DWORD)SYMBOL_TABLE[mid]) {
+    int32_t mid = ((uint32_t)(first + upto)) >> 1;
+    if (symbol < (uint32_t)SYMBOL_TABLE[mid]) {
       upto = mid;
-    } else if (symbol > (FX_DWORD)SYMBOL_TABLE[mid]) {
+    } else if (symbol > (uint32_t)SYMBOL_TABLE[mid]) {
       first = mid + 1;
     } else {
       return mid;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index 0360ef0b13..ded0df694b 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -740,9 +740,9 @@ void CBC_QRCoderEncoder::AppendGBKBytes(const CFX_ByteString& content,
                                         CBC_QRCoderBitVector* bits,
                                         int32_t& e) {
   int32_t length = content.GetLength();
-  FX_DWORD value = 0;
+  uint32_t value = 0;
   for (int32_t i = 0; i < length; i += 2) {
-    value = (FX_DWORD)((uint8_t)content[i] << 8 | (uint8_t)content[i + 1]);
+    value = (uint32_t)((uint8_t)content[i] << 8 | (uint8_t)content[i + 1]);
     if (value <= 0xAAFE && value >= 0xA1A1) {
       value -= 0xA1A1;
     } else if (value <= 0xFAFE && value >= 0xB0A1) {
@@ -751,7 +751,7 @@ void CBC_QRCoderEncoder::AppendGBKBytes(const CFX_ByteString& content,
       e = BCExceptionInvalidateCharacter;
       BC_EXCEPTION_CHECK_ReturnVoid(e);
     }
-    value = (FX_DWORD)((value >> 8) * 0x60) + (FX_DWORD)(value & 0xff);
+    value = (uint32_t)((value >> 8) * 0x60) + (uint32_t)(value & 0xff);
     bits->AppendBits(value, 13, e);
     BC_EXCEPTION_CHECK_ReturnVoid(e);
   }
@@ -777,9 +777,9 @@ void CBC_QRCoderEncoder::AppendKanjiBytes(const CFX_ByteString& content,
                                           CBC_QRCoderBitVector* bits,
                                           int32_t& e) {
   CFX_ByteArray bytes;
-  FX_DWORD value = 0;
+  uint32_t value = 0;
   for (int32_t i = 0; i < bytes.GetSize(); i += 2) {
-    value = (FX_DWORD)((uint8_t)(content[i] << 8) | (uint8_t)content[i + 1]);
+    value = (uint32_t)((uint8_t)(content[i] << 8) | (uint8_t)content[i + 1]);
     if (value <= 0x9ffc && value >= 0x8140) {
       value -= 0x8140;
     } else if (value <= 0xebbf && value >= 0xe040) {
@@ -788,7 +788,7 @@ void CBC_QRCoderEncoder::AppendKanjiBytes(const CFX_ByteString& content,
       e = BCExceptionInvalidateCharacter;
       BC_EXCEPTION_CHECK_ReturnVoid(e);
     }
-    value = (FX_DWORD)((value >> 8) * 0xc0) + (FX_DWORD)(value & 0xff);
+    value = (uint32_t)((value >> 8) * 0xc0) + (uint32_t)(value & 0xff);
     bits->AppendBits(value, 13, e);
     BC_EXCEPTION_CHECK_ReturnVoid(e);
   }