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

fpdfsdk/include/fsdk_baseform.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 FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 #define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 138 matching lines @@
         CPDF_FormField*                                 GetFormField() const;
         CPDF_FormControl*                               GetFormControl() const;
         static CPDF_FormControl*                GetFormControl(CPDF_InterForm* pInterForm, CPDF_Dictionary* pAnnotDict);
 
         void                                                    DrawShadow(CFX_RenderDevice* pDevice, CPDFSDK_PageView* pPageView);
         
         void                                                    SetAppModified();
         void                                                    ClearAppModified();
         FX_BOOL                                                 IsAppModified() const;
         
-        FX_INT32                                                GetAppearanceAge() const;
-        FX_INT32                                                GetValueAge() const;
+        int32_t                                         GetAppearanceAge() const;
+        int32_t                                         GetValueAge() const;
         
 private:
         void                                                    ResetAppearance_PushButton();
         void                                                    ResetAppearance_CheckBox();
         void                                                    ResetAppearance_RadioButton();
         void                                                    ResetAppearance_ComboBox(FX_LPCWSTR sValue);
         void                                                    ResetAppearance_ListBox();
         void                                                    ResetAppearance_TextField(FX_LPCWSTR sValue);
         
         CPDF_Rect                                               GetClientRect() const;
@@ skipping 11 matching lines @@
         void                                                    RemoveAppearance(const CFX_ByteString& sAPType);
 public:
         FX_BOOL                                                 IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode);
         void                                                    DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device,
                 CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions);
 public:
         FX_BOOL                                                 HitTest(FX_FLOAT pageX, FX_FLOAT pageY);
 private:
         CPDFSDK_InterForm*                              m_pInterForm;
         FX_BOOL                                                 m_bAppModified;
-        FX_INT32                                                m_nAppAge;
-        FX_INT32                                                m_nValueAge;
+        int32_t                                         m_nAppAge;
+        int32_t                                         m_nValueAge;
 
         IXFA_Widget*                                            m_hMixXFAWidget;
         IXFA_WidgetHandler*                             m_pWidgetHandler;
 };
 
 class CPDFSDK_XFAWidget : public CPDFSDK_Annot
 {
 public:
         CPDFSDK_XFAWidget(IXFA_Widget* pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm);
         virtual ~CPDFSDK_XFAWidget(){}
@@ skipping 106 matching lines @@
         CPDFSDK_XFAWidgetMap                    m_XFAMap;
         CPDFSDK_FieldSynchronizeMap             m_FieldSynchronizeMap;
         FX_BOOL                                                 m_bCalculate;
         FX_BOOL                                                 m_bXfaCalculate;
         FX_BOOL                                                 m_bXfaValidationsEnabled;
         FX_BOOL                                                 m_bBusy;
 
 public:
         FX_BOOL IsNeedHighLight(int nFieldType);
         void    RemoveAllHighLight();
-        void    SetHighlightAlpha(FX_BYTE alpha) {m_iHighlightAlpha = alpha;}
-        FX_BYTE GetHighlightAlpha() {return m_iHighlightAlpha;}
+        void    SetHighlightAlpha(uint8_t alpha) {m_iHighlightAlpha = alpha;}
+        uint8_t GetHighlightAlpha() {return m_iHighlightAlpha;}
         void    SetHighlightColor(FX_COLORREF clr, int nFieldType);
         FX_COLORREF GetHighlightColor(int nFieldType);
 private:
         FX_COLORREF m_aHighlightColor[7];
-        FX_BYTE m_iHighlightAlpha;
+        uint8_t m_iHighlightAlpha;
         FX_BOOL m_bNeedHightlight[7];
 };
 
 #define BAI_STRUCTURE           0
 #define BAI_ROW                         1
 #define BAI_COLUMN                      2
 
 #define CPDFSDK_Annots                          CFX_ArrayTemplate<CPDFSDK_Annot*>
 #define CPDFSDK_SortAnnots                      CGW_ArrayTemplate<CPDFSDK_Annot*>
 class CBA_AnnotIterator
@@ skipping 14 matching lines @@
         static CPDF_Rect                                        GetAnnotRect(CPDFSDK_Annot* pAnnot);
 
         CPDFSDK_PageView*                                       m_pPageView;
         CFX_ByteString                                          m_sType;
         CFX_ByteString                                          m_sSubType;
         int                                                                     m_nTabs;
         CPDFSDK_Annots                                          m_Annots;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_