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

xfa/src/fgas/src/font/fx_gdifont.h

Index: xfa/src/fgas/src/font/fx_gdifont.h
diff --git a/xfa/src/fgas/src/font/fx_gdifont.h b/xfa/src/fgas/src/font/fx_gdifont.h
index 3c159f505704a615cf0093d0c6d8312db1247bfc..b9143602e6b14009da14b3155766b97a26a9989f 100644
--- a/xfa/src/fgas/src/font/fx_gdifont.h
+++ b/xfa/src/fgas/src/font/fx_gdifont.h
@@ -31,7 +31,7 @@ public:
     virtual void			Release();
     virtual IFX_Font*		Retain();
     FX_BOOL			LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);
-    FX_BOOL			LoadFont(FX_LPCBYTE pBuffer, FX_INT32 iLength);
+    FX_BOOL			LoadFont(FX_LPCBYTE pBuffer, int32_t iLength);
     FX_BOOL			LoadFont(FX_LPCWSTR pszFileName);
     FX_BOOL			LoadFont(IFX_Stream *pFontStream);
     FX_BOOL			LoadFont(const LOGFONTW &lf);
@@ -44,23 +44,23 @@ public:
     {
         return m_dwStyles;
     }
-    virtual FX_BYTE			GetCharSet() const
+    virtual uint8_t			GetCharSet() const
     {
         return m_LogFont.lfCharSet;
     }
-    virtual FX_BOOL			GetCharWidth(FX_WCHAR wUnicode, FX_INT32 &iWidth, FX_BOOL bCharCode = FALSE);
-    virtual FX_INT32		GetGlyphIndex(FX_WCHAR wUnicode, FX_BOOL bCharCode = FALSE);
-    virtual FX_INT32		GetAscent() const;
-    virtual FX_INT32		GetDescent() const;
+    virtual FX_BOOL			GetCharWidth(FX_WCHAR wUnicode, int32_t &iWidth, FX_BOOL bCharCode = FALSE);
+    virtual int32_t		GetGlyphIndex(FX_WCHAR wUnicode, FX_BOOL bCharCode = FALSE);
+    virtual int32_t		GetAscent() const;
+    virtual int32_t		GetDescent() const;
     virtual FX_BOOL			GetCharBBox(FX_WCHAR wUnicode, CFX_Rect &bbox, FX_BOOL bCharCode = FALSE);
     virtual FX_BOOL			GetBBox(CFX_Rect &bbox);
-    virtual FX_INT32		GetItalicAngle() const;
+    virtual int32_t		GetItalicAngle() const;
     virtual void			Reset();
-    FX_DWORD		GetGlyphDIBits(FX_INT32 iGlyphIndex, FX_ARGB argb, const MAT2 *pMatrix, GLYPHMETRICS &gm, FX_LPVOID pBuffer, FX_DWORD bufSize);
+    FX_DWORD		GetGlyphDIBits(int32_t iGlyphIndex, FX_ARGB argb, const MAT2 *pMatrix, GLYPHMETRICS &gm, FX_LPVOID pBuffer, FX_DWORD bufSize);
     FX_DWORD		GetHashCode() const;
 protected:
     IFX_FontMgr				*m_pFontMgr;
-    FX_INT32				m_iRefCount;
+    int32_t				m_iRefCount;
     CFX_WordDiscreteArray	m_WidthCache;
     OUTLINETEXTMETRICW		m_OutlineTM;
     HGDIOBJ					m_hOldFont;
@@ -75,13 +75,13 @@ protected:
     CFX_MapPtrToPtr			m_FontMapper;
     CFX_MapPtrToPtr			m_FontCache;
     void			ClearCache();
-    FX_INT32		GetFontFamilies(Gdiplus::FontCollection &fc);
+    int32_t		GetFontFamilies(Gdiplus::FontCollection &fc);
     void			RetrieveFontStyles();
-    IFX_Font*		GetSubstFont(FX_INT32 iGlyphIndex) const;
-    FX_BOOL			GetCharWidth(FX_WCHAR wUnicode, FX_INT32 &iWidth, FX_BOOL bRecursive, FX_BOOL bCharCode = FALSE);
-    FX_INT32		GetGlyphIndex(FX_WCHAR wUnicode, FX_BOOL bRecursive, IFX_Font **ppFont, FX_BOOL bCharCode = FALSE);
+    IFX_Font*		GetSubstFont(int32_t iGlyphIndex) const;
+    FX_BOOL			GetCharWidth(FX_WCHAR wUnicode, int32_t &iWidth, FX_BOOL bRecursive, FX_BOOL bCharCode = FALSE);
+    int32_t		GetGlyphIndex(FX_WCHAR wUnicode, FX_BOOL bRecursive, IFX_Font **ppFont, FX_BOOL bCharCode = FALSE);
     FX_DWORD		GetMAT2HashCode(const FIXED *pFixed);
-    void			CreateGlyphBitmap(FX_INT32 iWidth, FX_INT32 iHeight, FX_LPBYTE pOutline, FX_LPDWORD pDIB, FX_ARGB argb);
+    void			CreateGlyphBitmap(int32_t iWidth, int32_t iHeight, FX_LPBYTE pOutline, FX_LPDWORD pDIB, FX_ARGB argb);
     friend class CFX_GdiFontMgr;
 };
 #endif