Merge to XFA: Use stdint.h types throughout PDFium.

xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h

Index: xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
index 49265e503318dc6432b9b971bbc2aa1ac7c40ade..5a0f15064ce30efac9ea324b3978e22497048f0d 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
@@ -10,19 +10,19 @@ class CBC_QRCoderErrorCorrectionLevel;
 class CBC_QRCoderFormatInformation
 {
 private:
-    const static FX_INT32 FORMAT_INFO_MASK_QR;
-    const static FX_INT32 FORMAT_INFO_DECODE_LOOKUP[32][2];
-    const static FX_INT32 BITS_SET_IN_HALF_BYTE[16];
+    const static int32_t FORMAT_INFO_MASK_QR;
+    const static int32_t FORMAT_INFO_DECODE_LOOKUP[32][2];
+    const static int32_t BITS_SET_IN_HALF_BYTE[16];
     CBC_QRCoderErrorCorrectionLevel* m_errorCorrectLevl;
-    FX_BYTE m_dataMask;
+    uint8_t m_dataMask;
 public:
-    CBC_QRCoderFormatInformation(FX_INT32 formatInfo);
+    CBC_QRCoderFormatInformation(int32_t formatInfo);
     virtual ~CBC_QRCoderFormatInformation();
-    FX_BYTE GetDataMask();
+    uint8_t GetDataMask();
     CBC_QRCoderErrorCorrectionLevel* GetErrorCorrectionLevel();
 
-    static FX_INT32 NumBitsDiffering(FX_INT32 a, FX_INT32 b);
-    static CBC_QRCoderFormatInformation* DecodeFormatInformation(FX_INT32 maskedFormatInfo);
-    static CBC_QRCoderFormatInformation* DoDecodeFormatInformation(FX_INT32 maskedFormatInfo);
+    static int32_t NumBitsDiffering(int32_t a, int32_t b);
+    static CBC_QRCoderFormatInformation* DecodeFormatInformation(int32_t maskedFormatInfo);
+    static CBC_QRCoderFormatInformation* DoDecodeFormatInformation(int32_t maskedFormatInfo);
 };
 #endif