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

xfa/src/fxbarcode/BC_Writer.h

Index: xfa/src/fxbarcode/BC_Writer.h
diff --git a/xfa/src/fxbarcode/BC_Writer.h b/xfa/src/fxbarcode/BC_Writer.h
index d92dc9b2eafc35c178e2ed6a85527e381a0c0bd9..3d226255c6b5654b255c42b85f0ea09cc16bb630 100644
--- a/xfa/src/fxbarcode/BC_Writer.h
+++ b/xfa/src/fxbarcode/BC_Writer.h
@@ -12,22 +12,22 @@ class CBC_Writer
 public:
     CBC_Writer();
     virtual ~CBC_Writer();
-    virtual FX_BYTE		*Encode(const CFX_ByteString &contents, BCFORMAT format, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32 &e) = 0;
-    virtual FX_BYTE		*Encode(const CFX_ByteString &contents, BCFORMAT format, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32 hints, FX_INT32 &e) = 0;
-    virtual FX_BOOL		SetCharEncoding(FX_INT32 encoding);
-    virtual FX_BOOL		SetModuleHeight(FX_INT32 moduleHeight);
-    virtual FX_BOOL		SetModuleWidth(FX_INT32 moduleWidth);
-    virtual FX_BOOL		SetHeight(FX_INT32 height);
-    virtual FX_BOOL		SetWidth(FX_INT32 width);
+    virtual uint8_t		*Encode(const CFX_ByteString &contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t &e) = 0;
+    virtual uint8_t		*Encode(const CFX_ByteString &contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t hints, int32_t &e) = 0;
+    virtual FX_BOOL		SetCharEncoding(int32_t encoding);
+    virtual FX_BOOL		SetModuleHeight(int32_t moduleHeight);
+    virtual FX_BOOL		SetModuleWidth(int32_t moduleWidth);
+    virtual FX_BOOL		SetHeight(int32_t height);
+    virtual FX_BOOL		SetWidth(int32_t width);
     virtual void		SetBackgroundColor(FX_ARGB backgroundColor);
     virtual void		SetBarcodeColor(FX_ARGB foregroundColor);
 protected:
-    CFX_DIBitmap*	CreateDIBitmap(FX_INT32 width, FX_INT32 height);
-    FX_INT32		m_CharEncoding;
-    FX_INT32		m_ModuleHeight;
-    FX_INT32		m_ModuleWidth;
-    FX_INT32		m_Height;
-    FX_INT32		m_Width;
+    CFX_DIBitmap*	CreateDIBitmap(int32_t width, int32_t height);
+    int32_t		m_CharEncoding;
+    int32_t		m_ModuleHeight;
+    int32_t		m_ModuleWidth;
+    int32_t		m_Height;
+    int32_t		m_Width;
     FXDIB_Format	m_colorSpace;
     FX_ARGB			m_barColor;
     FX_ARGB			m_backgroundColor;