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

xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h

Index: xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
index bf0ca71996270a9ab66dd0487b8d1b3893025880..7cfd978c47e7229b4a4b02e3538eb80dfd2429aa 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
@@ -15,14 +15,14 @@ class CBC_QRCodeWriter  : public CBC_TwoDimWriter
 public:
     CBC_QRCodeWriter();
     virtual ~CBC_QRCodeWriter();
-    FX_BYTE* Encode(const CFX_WideString& contents, FX_INT32 ecLevel, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32  &e);
-    FX_BYTE* Encode(const CFX_ByteString& contents, BCFORMAT format, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32 hints, FX_INT32 &e);
-    FX_BYTE* Encode(const CFX_ByteString& contents, BCFORMAT format, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32 &e);
-    FX_BOOL SetVersion(FX_INT32 version);
-    FX_BOOL SetErrorCorrectionLevel(FX_INT32 level);
+    uint8_t* Encode(const CFX_WideString& contents, int32_t ecLevel, int32_t &outWidth, int32_t &outHeight, int32_t  &e);
+    uint8_t* Encode(const CFX_ByteString& contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t hints, int32_t &e);
+    uint8_t* Encode(const CFX_ByteString& contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t &e);
+    FX_BOOL SetVersion(int32_t version);
+    FX_BOOL SetErrorCorrectionLevel(int32_t level);
     static void ReleaseAll();
 private:
 
-    FX_INT32 m_iVersion;
+    int32_t m_iVersion;
 };
 #endif