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

xfa/src/fgas/src/font/fx_gefont.h

Index: xfa/src/fgas/src/font/fx_gefont.h
diff --git a/xfa/src/fgas/src/font/fx_gefont.h b/xfa/src/fgas/src/font/fx_gefont.h
index 585a04c638715ca877d35ee5485f7f58699959b7..e03fd8844e92ff250818b2cee3045177cfe0020c 100644
--- a/xfa/src/fgas/src/font/fx_gefont.h
+++ b/xfa/src/fgas/src/font/fx_gefont.h
@@ -20,7 +20,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 length);
+    FX_BOOL			LoadFont(FX_LPCBYTE pBuffer, int32_t length);
     FX_BOOL			LoadFont(FX_LPCWSTR pszFileName);
     FX_BOOL			LoadFont(IFX_Stream *pFontStream, FX_BOOL bSaveStream);
     FX_BOOL			LoadFont(CFX_Font *pExtFont, FX_BOOL bTakeOver = FALSE);
@@ -28,16 +28,16 @@ public:
     virtual void			GetFamilyName(CFX_WideString &wsFamily) const;
     virtual void			GetPsName(CFX_WideString &wsName) const;
     virtual FX_DWORD		GetFontStyles() const;
-    virtual FX_BYTE			GetCharSet() const;
-    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 uint8_t			GetCharSet() 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();
-    virtual IFX_Font*		GetSubstFont(FX_INT32 iGlyphIndex) const;
+    virtual IFX_Font*		GetSubstFont(int32_t iGlyphIndex) const;
     virtual void*			GetDevFont()const
     {
         return (void*)m_pFont;
@@ -60,7 +60,7 @@ protected:
 #endif
     CFX_Font				*m_pFont;
     IFX_FontMgr				*m_pFontMgr;
-    FX_INT32				m_iRefCount;
+    int32_t				m_iRefCount;
     FX_BOOL					m_bExtFont;
     IFX_Stream				*m_pStream;
     IFX_FileRead			*m_pFileRead;
@@ -74,8 +74,8 @@ protected:
     CFX_MapPtrToPtr		m_FontMapper;
     void			InitFont();
     FX_BOOL		GetCharBBox(FX_WCHAR wUnicode, CFX_Rect &bbox, FX_BOOL bRecursive, FX_BOOL bCharCode = FALSE);
-    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);
+    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);
 };
 #endif
 #endif