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

xfa/include/fwl/lightwidget/combobox.h

Index: xfa/include/fwl/lightwidget/combobox.h
diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h
index 46aec5bc8a01b4e88c648ae8b6907d4a71656ab9..594c056e832fbf118780da2704f7ffa3e08e7ccd 100644
--- a/xfa/include/fwl/lightwidget/combobox.h
+++ b/xfa/include/fwl/lightwidget/combobox.h
@@ -17,27 +17,27 @@ class CFWL_ComboBox : public CFWL_Widget
 public:
     static CFWL_ComboBox* Create();
     FWL_ERR		Initialize(const CFWL_WidgetProperties *pProperties = NULL);
-    FX_INT32	AddString(FX_WSTR wsText);
-    FX_INT32	AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon);
-    FX_INT32	RemoveAt(FX_INT32 iIndex);
-    FX_INT32    RemoveAll();
-    FX_INT32	CountItems();
-    FWL_ERR		GetTextByIndex(FX_INT32 iIndex, CFX_WideString &wsText);
-    FX_INT32	GetCurSel();
-    FWL_ERR		SetCurSel(FX_INT32 iSel);
+    int32_t	AddString(FX_WSTR wsText);
+    int32_t	AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon);
+    int32_t	RemoveAt(int32_t iIndex);
+    int32_t    RemoveAll();
+    int32_t	CountItems();
+    FWL_ERR		GetTextByIndex(int32_t iIndex, CFX_WideString &wsText);
+    int32_t	GetCurSel();
+    FWL_ERR		SetCurSel(int32_t iSel);
     FWL_ERR		SetEditText(FX_WSTR wsText);
-    FX_INT32	GetEditTextLength() const;
-    FWL_ERR		GetEditText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const ;
-    FWL_ERR		SetEditSelRange(FX_INT32 nStart, FX_INT32 nCount = -1);
-    FX_INT32	GetEditSelRange(FX_INT32 nIndex, FX_INT32 &nStart);
-    FX_INT32	GetEditLimit();
-    FWL_ERR		SetEditLimit(FX_INT32 nLimit);
-    FWL_ERR		EditDoClipboard(FX_INT32 iCmd);
+    int32_t	GetEditTextLength() const;
+    FWL_ERR		GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const ;
+    FWL_ERR		SetEditSelRange(int32_t nStart, int32_t nCount = -1);
+    int32_t	GetEditSelRange(int32_t nIndex, int32_t &nStart);
+    int32_t	GetEditLimit();
+    FWL_ERR		SetEditLimit(int32_t nLimit);
+    FWL_ERR		EditDoClipboard(int32_t iCmd);
     FX_BOOL		EditRedo(FX_BSTR bsRecord);
     FX_BOOL		EditUndo(FX_BSTR bsRecord);
     FWL_ERR		SetMaxListHeight(FX_FLOAT fMaxHeight);
-    FWL_ERR		SetItemData(FX_INT32 iIndex, FX_LPVOID pData);
-    FX_LPVOID	GetItemData(FX_INT32 iIndex);
+    FWL_ERR		SetItemData(int32_t iIndex, FX_LPVOID pData);
+    FX_LPVOID	GetItemData(int32_t iIndex);
     FWL_ERR		SetListTheme(IFWL_ThemeProvider *pTheme);
     FX_BOOL		AfterFocusShowDropList();
     FWL_ERR		OpenDropDownList(FX_BOOL bActivate);
@@ -70,10 +70,10 @@ protected:
             return FWL_ERR_Succeeded;
         }
 
-        virtual	FX_INT32		CountItems(IFWL_Widget *pWidget);
-        virtual	FWL_HLISTITEM	GetItem(IFWL_Widget *pWidget, FX_INT32 nIndex);
-        virtual	FX_INT32		GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
-        virtual FX_BOOL			SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_INT32 nIndex);
+        virtual	int32_t		CountItems(IFWL_Widget *pWidget);
+        virtual	FWL_HLISTITEM	GetItem(IFWL_Widget *pWidget, int32_t nIndex);
+        virtual	int32_t		GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
+        virtual FX_BOOL			SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, int32_t nIndex);
 
         virtual	FX_DWORD		GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
         virtual	FWL_ERR			GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);