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

xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h

Index: xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
index 0b8c7d3ab79ede3b0b00bb523225b5a98bbcc571..c7abf75f8dfdb34e36190735925449d34fc7adbd 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
@@ -17,7 +17,7 @@ private:
 public:
     CBC_QRGridSampler();
     virtual ~CBC_QRGridSampler();
-    virtual CBC_CommonBitMatrix* SampleGrid(CBC_CommonBitMatrix *image, FX_INT32 dimensionX, FX_INT32 dimensionY,
+    virtual CBC_CommonBitMatrix* SampleGrid(CBC_CommonBitMatrix *image, int32_t dimensionX, int32_t dimensionY,
                                             FX_FLOAT p1ToX, FX_FLOAT p1ToY,
                                             FX_FLOAT p2ToX, FX_FLOAT p2ToY,
                                             FX_FLOAT p3ToX, FX_FLOAT p3ToY,
@@ -25,9 +25,9 @@ public:
                                             FX_FLOAT p1FromX, FX_FLOAT p1FromY,
                                             FX_FLOAT p2FromX, FX_FLOAT p2FromY,
                                             FX_FLOAT p3FromX, FX_FLOAT p3FromY,
-                                            FX_FLOAT p4FromX, FX_FLOAT p4FromY, FX_INT32 &e);
+                                            FX_FLOAT p4FromX, FX_FLOAT p4FromY, int32_t &e);
 
     static CBC_QRGridSampler &GetInstance();
-    static void CheckAndNudgePoints(CBC_CommonBitMatrix *image, CFX_FloatArray *points, FX_INT32 &e);
+    static void CheckAndNudgePoints(CBC_CommonBitMatrix *image, CFX_FloatArray *points, int32_t &e);
 };
 #endif