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

core/src/fpdfapi/fpdf_font/font_int.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 CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
 #define CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
 
 typedef void* FXFT_Library;
 class CPDF_CMapManager 
@@ skipping 30 matching lines @@
     struct {
         const FX_WORD*  m_pMap;
         int                             m_Count;
     } m_EmbeddedToUnicodes[NUMBER_OF_CIDSETS];
 private:
     CFX_MapPtrToPtr             m_pStockMap;
     FX_LPBYTE                   m_pContrastRamps;
 };
 struct _CMap_CodeRange {
     int                 m_CharSize;
-    FX_BYTE             m_Lower[4];
-    FX_BYTE             m_Upper[4];
+    uint8_t             m_Lower[4];
+    uint8_t             m_Upper[4];
 };
 class CPDF_CMapParser 
 {
 public:
     CPDF_CMapParser();
     ~CPDF_CMapParser() {}
     FX_BOOL     Initialize(CPDF_CMap*);
     void        ParseWord(FX_BSTR str);
     CFX_BinaryBuf       m_AddMaps;
 private:
@@ skipping 43 matching lines @@
     ~CPDF_CMap();
     friend class                        CPDF_CMapParser;
     friend class                        CPDF_CMapManager;
     friend class                        CPDF_CIDFont;
 protected:
     CFX_ByteString                      m_PredefinedCMap;
     FX_BOOL                                     m_bVertical;
     int                                         m_Charset, m_Coding;
     CodingScheme                        m_CodingScheme;
     int                                         m_nCodeRanges;
-    FX_BYTE*                            m_pLeadingBytes;
+    uint8_t*                            m_pLeadingBytes;
     FX_WORD*                            m_pMapping;
     FX_LPBYTE                           m_pAddMapping;
     FX_BOOL                                     m_bLoaded;
     const FXCMAP_CMap*          m_pEmbedMap;
     CPDF_CMap*                          m_pUseMap;
 };
 class CPDF_PredefinedCMap
 {
 public:
     FX_LPCSTR   m_pName;
     int                 m_Charset;
     int                 m_Coding;
     CPDF_CMap::CodingScheme     m_CodingScheme;
     FX_DWORD    m_LeadingSegCount;
-    FX_BYTE             m_LeadingSegs[4];
+    uint8_t             m_LeadingSegs[4];
 };
 typedef struct _FileHeader {
-    FX_BYTE             btTag[4];
-    FX_BYTE             btVersion;
-    FX_BYTE             btFormat;
-    FX_BYTE             btReserved1[2];
+    uint8_t             btTag[4];
+    uint8_t             btVersion;
+    uint8_t             btFormat;
+    uint8_t             btReserved1[2];
     FX_DWORD    dwStartIndex;
     FX_DWORD    dwEndIndex;
     FX_DWORD    dwDataSize;
     FX_DWORD    dwDataOffset;
     FX_DWORD    dwRecordSize;
 } FXMP_FILEHEADER;
 class CPDF_CID2UnicodeMap 
 {
 public:
     CPDF_CID2UnicodeMap();
@@ skipping 19 matching lines @@
     CFX_WideTextBuf                     m_MultiCharBuf;
 };
 class CPDF_FontCharMap : public CFX_CharMap
 {
 public:
     CPDF_FontCharMap(CPDF_Font* pFont);
     CPDF_Font*          m_pFont;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_