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

core/src/fxge/android/fpf_skiafont.h

Index: core/src/fxge/android/fpf_skiafont.h
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h
index 135c830c957a360c6e77e3cd3b14455129cfccef..72b569fe2e9359b60781dc04cac528b9ffad3606 100644
--- a/core/src/fxge/android/fpf_skiafont.h
+++ b/core/src/fxge/android/fpf_skiafont.h
@@ -28,30 +28,30 @@ public:
     {
         return m_dwStyle;
     }
-    virtual FX_BYTE			GetCharset() const
+    virtual uint8_t			GetCharset() const
     {
         return m_uCharset;
     }
 
-    virtual FX_INT32		GetGlyphIndex(FX_WCHAR wUnicode);
-    virtual FX_INT32		GetGlyphWidth(FX_INT32 iGlyphIndex);
+    virtual int32_t		GetGlyphIndex(FX_WCHAR wUnicode);
+    virtual int32_t		GetGlyphWidth(int32_t iGlyphIndex);
 
-    virtual FX_INT32		GetAscent() const;
-    virtual FX_INT32		GetDescent() const;
+    virtual int32_t		GetAscent() const;
+    virtual int32_t		GetDescent() const;
 
-    virtual FX_BOOL			GetGlyphBBox(FX_INT32 iGlyphIndex, FX_RECT &rtBBox);
+    virtual FX_BOOL			GetGlyphBBox(int32_t iGlyphIndex, FX_RECT &rtBBox);
     virtual FX_BOOL			GetBBox(FX_RECT &rtBBox);
 
-    virtual FX_INT32		GetHeight() const;
-    virtual FX_INT32		GetItalicAngle() const;
+    virtual int32_t		GetHeight() const;
+    virtual int32_t		GetItalicAngle() const;
     virtual FX_DWORD		GetFontData(FX_DWORD dwTable, FX_LPBYTE pBuffer, FX_DWORD dwSize);
-    FX_BOOL					InitFont(CFPF_SkiaFontMgr *pFontMgr, CFPF_SkiaFontDescriptor *pFontDes, FX_BSTR bsFamily, FX_DWORD dwStyle, FX_BYTE uCharset);
+    FX_BOOL					InitFont(CFPF_SkiaFontMgr *pFontMgr, CFPF_SkiaFontDescriptor *pFontDes, FX_BSTR bsFamily, FX_DWORD dwStyle, uint8_t uCharset);
 protected:
     CFPF_SkiaFontMgr		*m_pFontMgr;
     CFPF_SkiaFontDescriptor	*m_pFontDes;
     FXFT_Face				m_Face;
     FX_DWORD				m_dwStyle;
-    FX_BYTE					m_uCharset;
+    uint8_t					m_uCharset;
     FX_DWORD				m_dwRefCount;
 };
 #endif