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

xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h

Index: xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
index 17d392121d405371c9590c9536d77bc2307c53c8..46a80c8d096372823160de5acae4b3cc91c054fe 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
@@ -12,30 +12,30 @@ class CBC_QRCoderErrorCorrectionLevel;
 class CBC_QRCoderVersion
 {
 private:
-    const static FX_INT32 VERSION_DECODE_INFO[34];
+    const static int32_t VERSION_DECODE_INFO[34];
     static CFX_PtrArray *VERSION;
-    FX_INT32 m_versionNumber;
-    FX_INT32 m_totalCodeWords;
+    int32_t m_versionNumber;
+    int32_t m_totalCodeWords;
     CFX_Int32Array m_alignmentPatternCenters;
     CFX_PtrArray m_ecBlocks;
 
     CBC_QRCoderVersion();
-    CBC_QRCoderVersion(FX_INT32 versionNumber, CBC_QRCoderECBlocks* ecBlocks1, CBC_QRCoderECBlocks* ecBlocks2,
+    CBC_QRCoderVersion(int32_t versionNumber, CBC_QRCoderECBlocks* ecBlocks1, CBC_QRCoderECBlocks* ecBlocks2,
                        CBC_QRCoderECBlocks* ecBlocks3, CBC_QRCoderECBlocks* ecBlocks4);
 public:
     virtual ~CBC_QRCoderVersion();
     static void Initialize();
     static void Finalize();
 
-    FX_INT32 GetVersionNumber();
-    FX_INT32 GetTotalCodeWords();
-    FX_INT32 GetDimensionForVersion();
-    CBC_CommonBitMatrix *BuildFunctionPattern(FX_INT32 &e);
+    int32_t GetVersionNumber();
+    int32_t GetTotalCodeWords();
+    int32_t GetDimensionForVersion();
+    CBC_CommonBitMatrix *BuildFunctionPattern(int32_t &e);
     CFX_Int32Array* GetAlignmentPatternCenters();
     CBC_QRCoderECBlocks* GetECBlocksForLevel(CBC_QRCoderErrorCorrectionLevel *ecLevel);
-    static CBC_QRCoderVersion* GetVersionForNumber(FX_INT32 versionNumber, FX_INT32 &e);
-    static CBC_QRCoderVersion* GetProvisionalVersionForDimension(FX_INT32 dimension, FX_INT32 &e);
-    static CBC_QRCoderVersion* DecodeVersionInformation(FX_INT32 versionBits, FX_INT32 &e);
+    static CBC_QRCoderVersion* GetVersionForNumber(int32_t versionNumber, int32_t &e);
+    static CBC_QRCoderVersion* GetProvisionalVersionForDimension(int32_t dimension, int32_t &e);
+    static CBC_QRCoderVersion* DecodeVersionInformation(int32_t versionBits, int32_t &e);
     static void Destroy();
 };
 #endif