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

xfa/src/fxbarcode/BC_TwoDimWriter.h

Index: xfa/src/fxbarcode/BC_TwoDimWriter.h
diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.h b/xfa/src/fxbarcode/BC_TwoDimWriter.h
index 369d494c0863d572defba31d19313867209146ca..9ed2932c27cd5f491b66c97c0ff51a6374b43cc8 100644
--- a/xfa/src/fxbarcode/BC_TwoDimWriter.h
+++ b/xfa/src/fxbarcode/BC_TwoDimWriter.h
@@ -15,29 +15,29 @@ class CBC_TwoDimWriter : public CBC_Writer
 public:
     CBC_TwoDimWriter();
     virtual ~CBC_TwoDimWriter();
-    virtual FX_BYTE*	Encode(const CFX_WideString& contents, FX_INT32 ecLevel, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32  &e)
+    virtual uint8_t*	Encode(const CFX_WideString& contents, int32_t ecLevel, int32_t &outWidth, int32_t &outHeight, int32_t  &e)
     {
         return NULL;
     };
-    virtual FX_BYTE*	Encode(const CFX_ByteString& contents, BCFORMAT format, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32 hints, FX_INT32 &e)
+    virtual uint8_t*	Encode(const CFX_ByteString& contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t hints, int32_t &e)
     {
         return NULL;
     };
-    virtual FX_BYTE*	Encode(const CFX_ByteString& contents, BCFORMAT format, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32 &e)
+    virtual uint8_t*	Encode(const CFX_ByteString& contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t &e)
     {
         return NULL;
     };
-    virtual void		RenderResult(FX_BYTE *code, FX_INT32 codeWidth, FX_INT32 codeHeight, FX_INT32 &e);
-    virtual void        RenderBitmapResult(CFX_DIBitmap *&pOutBitmap, FX_INT32& e);
+    virtual void		RenderResult(uint8_t *code, int32_t codeWidth, int32_t codeHeight, int32_t &e);
+    virtual void        RenderBitmapResult(CFX_DIBitmap *&pOutBitmap, int32_t& e);
     virtual void        RenderDeviceResult(CFX_RenderDevice* device, const CFX_Matrix* matrix);
-    virtual FX_BOOL		SetErrorCorrectionLevel (FX_INT32 level) = 0;
-    virtual FX_INT32    GetErrorCorrectionLevel()
+    virtual FX_BOOL		SetErrorCorrectionLevel (int32_t level) = 0;
+    virtual int32_t    GetErrorCorrectionLevel()
     {
         return m_iCorrectLevel;
     };
 
 protected:
-    FX_INT32		m_iCorrectLevel;
+    int32_t		m_iCorrectLevel;
     FX_BOOL			m_bFixedSize;
     CBC_CommonBitMatrix*     m_output;
 };