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

core/include/fpdfdoc/fpdf_doc.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_INCLUDE_FPDFDOC_FPDF_DOC_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 
 #include "../fpdfapi/fpdf_parser.h"
@@ skipping 313 matching lines @@
 
     FX_DWORD                    GetFlags() const
     {
         return m_pDict->GetInteger("Flags");
     }
 
     CFX_WideString              GetJavaScript() const;
 
     CPDF_Dictionary*    GetAnnot() const;
 
-    FX_INT32                    GetOperationType() const;
+    int32_t                             GetOperationType() const;
 
     CPDF_Stream*                GetSoundStream() const
     {
         return m_pDict->GetStream("Sound");
     }
 
     FX_FLOAT                    GetVolume() const
     {
         return m_pDict->GetNumber("Volume");
     }
@@ skipping 381 matching lines @@
 
     static FX_BOOL                      UpdatingAPEnabled();
 
 
     static CFX_ByteString       GenerateNewResourceName(const CPDF_Dictionary* pResDict, FX_LPCSTR csType, int iMinLen = 2, FX_LPCSTR csPrefix = "");
 
 
 
     static CPDF_Font*           AddSystemDefaultFont(const CPDF_Document* pDocument);
 
-    static CPDF_Font*           AddSystemFont(const CPDF_Document* pDocument, CFX_ByteString csFontName, FX_BYTE iCharSet = 1);
+    static CPDF_Font*           AddSystemFont(const CPDF_Document* pDocument, CFX_ByteString csFontName, uint8_t iCharSet = 1);
 
-    static CPDF_Font*           AddSystemFont(const CPDF_Document* pDocument, CFX_WideString csFontName, FX_BYTE iCharSet = 1);
+    static CPDF_Font*           AddSystemFont(const CPDF_Document* pDocument, CFX_WideString csFontName, uint8_t iCharSet = 1);
 
     static CPDF_Font*           AddStandardFont(const CPDF_Document* pDocument, CFX_ByteString csFontName);
 
-    static CFX_ByteString       GetNativeFont(FX_BYTE iCharSet, FX_LPVOID pLogFont = NULL);
+    static CFX_ByteString       GetNativeFont(uint8_t iCharSet, FX_LPVOID pLogFont = NULL);
 
     static CFX_ByteString       GetNativeFont(FX_LPVOID pLogFont = NULL);
 
-    static FX_BYTE                      GetNativeCharSet();
+    static uint8_t                      GetNativeCharSet();
 
-    static CPDF_Font*           AddNativeFont(FX_BYTE iCharSet, const CPDF_Document* pDocument);
+    static CPDF_Font*           AddNativeFont(uint8_t iCharSet, const CPDF_Document* pDocument);
 
     static CPDF_Font*           AddNativeFont(const CPDF_Document* pDocument);
 
 
 
 
     FX_BOOL                                     ValidateFieldName(CFX_WideString& csNewFieldName, int iType);
 
     FX_BOOL                                     ValidateFieldName(const CPDF_FormField* pField, CFX_WideString& csNewFieldName);
 
@@ skipping 71 matching lines @@
 
 
     FX_DWORD                            CountFormFonts();
 
     CPDF_Font*                          GetFormFont(FX_DWORD index, CFX_ByteString& csNameTag);
 
     CPDF_Font*                          GetFormFont(CFX_ByteString csNameTag);
 
     CPDF_Font*                          GetFormFont(CFX_ByteString csFontName, CFX_ByteString& csNameTag);
 
-    CPDF_Font*                          GetNativeFormFont(FX_BYTE iCharSet, CFX_ByteString& csNameTag);
+    CPDF_Font*                          GetNativeFormFont(uint8_t iCharSet, CFX_ByteString& csNameTag);
 
     CPDF_Font*                          GetNativeFormFont(CFX_ByteString& csNameTag);
 
     FX_BOOL                                     FindFormFont(const CPDF_Font* pFont, CFX_ByteString& csNameTag);
 
     FX_BOOL                                     FindFormFont(CFX_ByteString csFontName, CPDF_Font*& pFont, CFX_ByteString& csNameTag);
 
     inline FX_BOOL                      FindFormFont(CFX_WideString csFontName, CPDF_Font*& pFont, CFX_ByteString& csNameTag)
     {
         return FindFormFont(PDF_EncodeText(csFontName), pFont, csNameTag);
     }
 
 
 
 
 
     void                                        AddFormFont(const CPDF_Font* pFont, CFX_ByteString& csNameTag);
 
-    CPDF_Font*                          AddNativeFormFont(FX_BYTE iCharSet, CFX_ByteString& csNameTag);
+    CPDF_Font*                          AddNativeFormFont(uint8_t iCharSet, CFX_ByteString& csNameTag);
 
     CPDF_Font*                          AddNativeFormFont(CFX_ByteString& csNameTag);
 
     void                                        RemoveFormFont(const CPDF_Font* pFont);
 
     void                                        RemoveFormFont(CFX_ByteString csNameTag);
 
 
 
 
@@ skipping 640 matching lines @@
 public:
 
     CPDF_PageLabel(CPDF_Document* pDocument)
     {
         m_pDocument = pDocument;
     }
 
 
     CFX_WideString                                      GetLabel(int nPage) const;
 
-    FX_INT32                                            GetPageByLabel(FX_BSTR bsLabel) const;
+    int32_t                                             GetPageByLabel(FX_BSTR bsLabel) const;
 
 
-    FX_INT32                                            GetPageByLabel(FX_WSTR wsLabel) const;
+    int32_t                                             GetPageByLabel(FX_WSTR wsLabel) const;
 
 protected:
     CPDF_Document*                                      m_pDocument;
 };
 class CPDF_Metadata
 {
 public:
 
     CPDF_Metadata();
 
 
     ~CPDF_Metadata();
 
     void                                LoadDoc(CPDF_Document *pDoc);
 
 
-    FX_INT32                    GetString(FX_BSTR bsItem, CFX_WideString &wsStr);
+    int32_t                     GetString(FX_BSTR bsItem, CFX_WideString &wsStr);
 
     CXML_Element*               GetRoot() const;
 
     CXML_Element*               GetRDF() const;
 
 protected:
     FX_LPVOID   m_pData;
 };
 class CPDF_ViewerPreferences
 {
 public:
 
     CPDF_ViewerPreferences(CPDF_Document *pDoc);
 
 
     ~CPDF_ViewerPreferences();
 
 
     FX_BOOL IsDirectionR2L() const;
 
     FX_BOOL PrintScaling() const;
 
-    FX_INT32 NumCopies() const;
+    int32_t NumCopies() const;
 
     CPDF_Array* PrintPageRange() const;
 
     CFX_ByteString Duplex() const;
 
 protected:
     CPDF_Document*      m_pDoc;
 };
 class CPDF_ApSettings
 {
@@ skipping 118 matching lines @@
 
     void                                        GetOriginalColor(int& iColorType, FX_FLOAT fc[4], FX_BSTR csEntry);
 
     CFX_WideString                      GetCaption(FX_BSTR csEntry);
 
     CPDF_Stream*                        GetIcon(FX_BSTR csEntry);
     friend class                        CPDF_FormControl;
 };
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_