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

xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp

Index: xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
index d0c55734db1e1157d077396bc7fd9405f3b433e9..e17a58db439299a4f1abdf79f068c01d9540565f 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
@@ -27,7 +27,7 @@
 CBC_CommonDecoderResult::CBC_CommonDecoderResult()
 {
 }
-void CBC_CommonDecoderResult::Init(const CFX_ByteArray &rawBytes, const CFX_ByteString &text, const CFX_Int32Array &byteSegments,  CBC_QRCoderErrorCorrectionLevel* ecLevel, FX_INT32 &e)
+void CBC_CommonDecoderResult::Init(const CFX_ByteArray &rawBytes, const CFX_ByteString &text, const CFX_Int32Array &byteSegments,  CBC_QRCoderErrorCorrectionLevel* ecLevel, int32_t &e)
 {
     if(text.IsEmpty()) {
         e = BCExceptionIllegalArgument;
@@ -39,7 +39,7 @@ void CBC_CommonDecoderResult::Init(const CFX_ByteArray &rawBytes, const CFX_Byte
     m_ecLevel = ecLevel;
     m_other = NULL;
 }
-void CBC_CommonDecoderResult::Init(const CFX_ByteArray &rawBytes, const CFX_ByteString &text, const CFX_PtrArray &byteSegments, const CFX_ByteString &ecLevel, FX_INT32 &e)
+void CBC_CommonDecoderResult::Init(const CFX_ByteArray &rawBytes, const CFX_ByteString &text, const CFX_PtrArray &byteSegments, const CFX_ByteString &ecLevel, int32_t &e)
 {
     if(text.IsEmpty()) {
         e = BCExceptionIllegalArgument;