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

xfa/src/fgas/include/fx_fnt.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FX_FONT
 #define _FX_FONT
 class IFX_Font;
 class IFX_FontMgr;
@@ skipping 22 matching lines @@
 #define FX_FONTDECORATION_Hide                          0x40000000
 #define FX_FONTDECORATION_StrokeFill            0x80000000
 #define FX_BOUNDINGSHAPE_None                   0
 #define FX_BOUNDINGSHAPE_Circle                 1
 #define FX_BOUNDINGSHAPE_Square                 2
 #define FX_BOUNDINGSHAPE_Triangle               3
 #define FX_BOUNDINGSHAPE_Diamond                4
 class IFX_FontProvider
 {
 public:
-    virtual FX_BOOL             GetCharWidth(IFX_Font* pFont, FX_WCHAR wUnicode, FX_INT32 &iWidth, FX_BOOL bCharCode = FALSE) = 0;
+    virtual FX_BOOL             GetCharWidth(IFX_Font* pFont, FX_WCHAR wUnicode, int32_t &iWidth, FX_BOOL bCharCode = FALSE) = 0;
 };
 class IFX_Font
 {
 public:
     static IFX_Font*            LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage, IFX_FontMgr *pFontMgr);
-    static IFX_Font*            LoadFont(FX_LPCBYTE pBuffer, FX_INT32 iLength, IFX_FontMgr *pFontMgr);
+    static IFX_Font*            LoadFont(FX_LPCBYTE pBuffer, int32_t iLength, IFX_FontMgr *pFontMgr);
     static IFX_Font*            LoadFont(FX_LPCWSTR pszFileName, IFX_FontMgr *pFontMgr);
     static IFX_Font*            LoadFont(IFX_Stream *pFontStream, IFX_FontMgr *pFontMgr, FX_BOOL bSaveStream = FALSE);
     static IFX_Font*            LoadFont(CFX_Font *pExtFont, IFX_FontMgr *pFontMgr, FX_BOOL bTakeOver = FALSE);
     virtual void                        Release() = 0;
     virtual IFX_Font*           Retain() = 0;
     virtual IFX_Font*           Derive(FX_DWORD dwFontStyles, FX_WORD wCodePage = 0) = 0;
     virtual void                        GetFamilyName(CFX_WideString &wsFamily) const = 0;
     virtual void                        GetPsName(CFX_WideString &wsName) const = 0;
     virtual FX_DWORD            GetFontStyles() const = 0;
-    virtual FX_BYTE                     GetCharSet() const = 0;
-    virtual FX_BOOL                     GetCharWidth(FX_WCHAR wUnicode, FX_INT32 &iWidth, FX_BOOL bCharCode = FALSE) = 0;
-    virtual FX_INT32            GetGlyphIndex(FX_WCHAR wUnicode, FX_BOOL bCharCode = FALSE) = 0;
-    virtual FX_INT32            GetAscent() const = 0;
-    virtual FX_INT32            GetDescent() const = 0;
+    virtual uint8_t                     GetCharSet() const = 0;
+    virtual FX_BOOL                     GetCharWidth(FX_WCHAR wUnicode, int32_t &iWidth, FX_BOOL bCharCode = FALSE) = 0;
+    virtual int32_t             GetGlyphIndex(FX_WCHAR wUnicode, FX_BOOL bCharCode = FALSE) = 0;
+    virtual int32_t             GetAscent() const = 0;
+    virtual int32_t             GetDescent() const = 0;
     virtual FX_BOOL                     GetCharBBox(FX_WCHAR wUnicode, CFX_Rect &bbox, FX_BOOL bCharCode = FALSE) = 0;
     virtual FX_BOOL                     GetBBox(CFX_Rect &bbox) = 0;
-    virtual FX_INT32            GetItalicAngle() const = 0;
+    virtual int32_t             GetItalicAngle() const = 0;
     virtual void                        Reset() = 0;
-    virtual IFX_Font*           GetSubstFont(FX_INT32 iGlyphIndex) const = 0;
+    virtual IFX_Font*           GetSubstFont(int32_t iGlyphIndex) const = 0;
     virtual void*                       GetDevFont() const = 0;
     virtual void                        SetFontProvider(IFX_FontProvider* pProvider) = 0;
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
     virtual void                        SetLogicalFontStyle(FX_DWORD dwLogFontStyle) = 0;
 #endif
 };
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 typedef struct _FX_FONTMATCHPARAMS {
     FX_LPCWSTR                          pwsFamily;
     FX_DWORD                            dwFontStyles;
     FX_DWORD                            dwUSB;
     FX_DWORD                            dwMatchFlags;
     FX_WCHAR                            wUnicode;
     FX_WORD                                     wCodePage;
 } FX_FONTMATCHPARAMS, * FX_LPFONTMATCHPARAMS;
 typedef FX_FONTMATCHPARAMS const * FX_LPCFONTMATCHPARAMS;
 typedef struct _FX_FONTSIGNATURE : public CFX_Target {
     FX_DWORD                            fsUsb[4];
     FX_DWORD                            fsCsb[2];
 } FX_FONTSIGNATURE;
 typedef struct _FX_FONTDESCRIPTOR : public CFX_Target {
     FX_WCHAR                            wsFontFace[32];
     FX_DWORD                            dwFontStyles;
-    FX_BYTE                                     uCharSet;
+    uint8_t                                     uCharSet;
     FX_FONTSIGNATURE            FontSignature;
 } FX_FONTDESCRIPTOR, * FX_LPFONTDESCRIPTOR;
 typedef FX_FONTDESCRIPTOR const * FX_LPCFONTDESCRIPTOR;
 typedef CFX_MassArrayTemplate<FX_FONTDESCRIPTOR> CFX_FontDescriptors;
 inline FX_BOOL operator == (const FX_FONTDESCRIPTOR &left, const FX_FONTDESCRIPTOR &right)
 {
     return left.uCharSet == right.uCharSet
            && left.dwFontStyles == right.dwFontStyles
            && FXSYS_wcscmp(left.wsFontFace, right.wsFontFace) == 0
            && FXSYS_memcmp(&left.FontSignature, &right.FontSignature, sizeof(FX_FONTSIGNATURE)) == 0;
 }
 #define FX_FONTMATCHPARA_MacthStyle             0x01
 #define FX_FONTMATCHPARA_MacthFamily    0x02
 #define FX_FONTMATCHPARA_MacthUnicode   0x04
 typedef void (*FX_LPEnumAllFonts)(CFX_FontDescriptors &fonts, FX_LPVOID pUserData, FX_LPCWSTR pwsFaceName, FX_WCHAR wUnicode);
 FX_LPEnumAllFonts FX_GetDefFontEnumerator();
 typedef FX_LPCFONTDESCRIPTOR (*FX_LPMatchFont)(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, FX_LPVOID pUserData);
 FX_LPMatchFont FX_GetDefFontMatchor();
 class IFX_FontMgr
 {
 public:
     static IFX_FontMgr* Create(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher = NULL, FX_LPVOID pUserData = NULL);
     virtual void                        Release() = 0;
     virtual IFX_Font*           GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
-    virtual IFX_Font*           GetDefFontByCharset(FX_BYTE nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
+    virtual IFX_Font*           GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0;
-    virtual IFX_Font*           LoadFont(FX_LPCBYTE pBuffer, FX_INT32 iLength) = 0;
+    virtual IFX_Font*           LoadFont(FX_LPCBYTE pBuffer, int32_t iLength) = 0;
     virtual IFX_Font*           LoadFont(FX_LPCWSTR pszFileName) = 0;
     virtual IFX_Font*           LoadFont(IFX_Stream *pFontStream, FX_LPCWSTR pszFontAlias = NULL, FX_DWORD dwFontStyles = 0, FX_WORD wCodePage = 0, FX_BOOL bSaveStream = FALSE) = 0;
     virtual IFX_Font*           LoadFont(IFX_Font *pSrcFont, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0;
     virtual void                        ClearFontCache() = 0;
     virtual void                        RemoveFont(IFX_Font *pFont) = 0;
 };
 #else
 class IFX_FontMgrDelegate
 {
 public:
     virtual IFX_Font*           GetDefFontByCodePage(IFX_FontMgr* pFontMgr, FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
-    virtual IFX_Font*           GetDefFontByCharset(IFX_FontMgr* pFontMgr, FX_BYTE nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
+    virtual IFX_Font*           GetDefFontByCharset(IFX_FontMgr* pFontMgr, uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           GetDefFontByUnicode(IFX_FontMgr* pFontMgr, FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           GetDefFontByLanguage(IFX_FontMgr* pFontMgr, FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
 };
 class IFX_FontSourceEnum
 {
 public:
     virtual     void                    Release() = 0;
     virtual FX_POSITION         GetStartPosition(FX_LPVOID pUserData = NULL) = 0;
     virtual IFX_FileAccess*     GetNext(FX_POSITION& pos, FX_LPVOID pUserData = NULL) = 0;
 };
 IFX_FontSourceEnum*     FX_CreateDefaultFontSourceEnum();
 class IFX_FontMgr
 {
 public:
     static IFX_FontMgr* Create(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate = NULL, FX_LPVOID pUserData = NULL);
     virtual void                Release() = 0;
     virtual IFX_Font*           GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
-    virtual IFX_Font*           GetDefFontByCharset(FX_BYTE nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
+    virtual IFX_Font*           GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           GetFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     inline IFX_Font*            LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage)
     {
         return GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily);
     }
-    virtual IFX_Font*           GetFontByCharset(FX_BYTE nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
+    virtual IFX_Font*           GetFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           GetFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
     virtual IFX_Font*           GetFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0;
-    virtual IFX_Font*           LoadFont(FX_LPCBYTE pBuffer, FX_INT32 iLength, FX_INT32 iFaceIndex, FX_INT32* pFaceCount = NULL) = 0;
-    virtual IFX_Font*           LoadFont(FX_LPCWSTR pszFileName, FX_INT32 iFaceIndex, FX_INT32* pFaceCount = NULL) = 0;
-    virtual IFX_Font*           LoadFont(IFX_Stream *pFontStream, FX_INT32 iFaceIndex, FX_INT32* pFaceCount = NULL, FX_BOOL bSaveStream = FALSE) = 0;
+    virtual IFX_Font*           LoadFont(FX_LPCBYTE pBuffer, int32_t iLength, int32_t iFaceIndex, int32_t* pFaceCount = NULL) = 0;
+    virtual IFX_Font*           LoadFont(FX_LPCWSTR pszFileName, int32_t iFaceIndex, int32_t* pFaceCount = NULL) = 0;
+    virtual IFX_Font*           LoadFont(IFX_Stream *pFontStream, int32_t iFaceIndex, int32_t* pFaceCount = NULL, FX_BOOL bSaveStream = FALSE) = 0;
 
     virtual void                        ClearFontCache() = 0;
     virtual void                        RemoveFont(IFX_Font *pFont) = 0;
 };
 #endif
 #endif