From bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 13:24:12 -0700 Subject: Merge to XFA: Use stdint.h types throughout PDFium. Near-automatic merge, plus re-running scripts to update additional usage. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1172793002 --- xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h | 4 ++-- xfa/include/fwl/adapter/fwl_adaptermonitormgr.h | 4 ++-- xfa/include/fwl/adapter/fwl_adapterthreadmgr.h | 6 +++--- xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h | 6 +++--- xfa/include/fwl/adapter/fwl_sdadapterimp.h | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'xfa/include/fwl/adapter') diff --git a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h index 82a098ebbb..196e6503d9 100644 --- a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h @@ -22,8 +22,8 @@ public: virtual FWL_ERR Empty() = 0; virtual FX_BOOL IsDataAvailable(FX_DWORD dwFormat) = 0; virtual FWL_HCLIPBOARDDATA GetData(FX_DWORD dwFormat) = 0; - virtual FWL_ERR SetData(FX_DWORD dwFormat, FX_BYTE *pBuf, FX_INT32 iSize) = 0; - virtual FX_INT32 GetDataSize(FWL_HCLIPBOARDDATA hData) = 0; + virtual FWL_ERR SetData(FX_DWORD dwFormat, uint8_t *pBuf, int32_t iSize) = 0; + virtual int32_t GetDataSize(FWL_HCLIPBOARDDATA hData) = 0; virtual FX_LPVOID LockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0; virtual FX_BOOL UnLockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0; virtual FWL_ERR SetStringData(FX_WSTR ws) = 0; diff --git a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h index bd194964c9..8830a3de81 100644 --- a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h +++ b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h @@ -13,8 +13,8 @@ typedef struct _FWL_HMONITOR { class IFWL_AdapterMonitorMgr { public: - virtual FX_INT32 CountMonitors() = 0; - virtual FWL_HMONITOR GetMonitor(FX_INT32 nIndex) = 0; + virtual int32_t CountMonitors() = 0; + virtual FWL_HMONITOR GetMonitor(int32_t nIndex) = 0; virtual FWL_HMONITOR GetCurrentMonitor() = 0; virtual FWL_HMONITOR GetMonitorByRect(const CFX_RectF &rect) = 0; virtual FWL_HMONITOR GetMonitorByPoint(FX_FLOAT fx, FX_FLOAT fy) = 0; diff --git a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h index ad6cd58245..f3e01855b0 100644 --- a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h @@ -16,8 +16,8 @@ public: virtual FWL_ERR Start(IFWL_Thread *pThread, FWL_HTHREAD &hThread, FX_BOOL bSuspended = FALSE) = 0; virtual FWL_ERR Resume(FWL_HTHREAD hThread) = 0; virtual FWL_ERR Suspend(FWL_HTHREAD hThread) = 0; - virtual FWL_ERR Kill(FWL_HTHREAD hThread, FX_INT32 iExitCode) = 0; - virtual FWL_ERR Stop(FWL_HTHREAD hThread, FX_INT32 iExitCode) = 0; + virtual FWL_ERR Kill(FWL_HTHREAD hThread, int32_t iExitCode) = 0; + virtual FWL_ERR Stop(FWL_HTHREAD hThread, int32_t iExitCode) = 0; virtual IFWL_Thread* GetCurrentThread() = 0; }; class IFWL_AdapterSemaphore @@ -28,6 +28,6 @@ public: virtual FWL_ERR Wait() const = 0; virtual FWL_ERR Post() = 0; virtual FWL_ERR Value(FX_DWORD &val) const = 0; - virtual FWL_ERR Reset(FX_INT32 init) = 0; + virtual FWL_ERR Reset(int32_t init) = 0; }; #endif diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h index fbc296f7fa..e8c3b89674 100644 --- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h @@ -37,7 +37,7 @@ public: virtual FX_BOOL IsIdleMessage() = 0; virtual FWL_ERR DispatchMessage() = 0; virtual FWL_ERR RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect) = 0; - virtual FWL_ERR Exit(FX_INT32 iExitCode) = 0; + virtual FWL_ERR Exit(int32_t iExitCode) = 0; virtual FWL_ERR CreateWidgetWithNativeId(IFWL_Widget *pWidget, FX_LPVOID UserData) = 0; virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, FX_LPVOID &pDC) = 0; virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, FX_LPVOID pDC, CFX_RectF *pClip = 0) = 0; @@ -46,8 +46,8 @@ public: virtual FWL_ERR RunLoop(IFWL_Widget *widget) = 0; virtual FWL_ERR EndLoop() = 0; virtual FWL_ERR InitMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0; - virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, FX_INT32 iType) = 0; - virtual FX_INT32 TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0; + virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, int32_t iType) = 0; + virtual int32_t TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0; virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook *hook) = 0; virtual FWL_ERR GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b) = 0; virtual FX_BOOL GetPopupPos(IFWL_Widget* pWidget, FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight, const CFX_RectF &rtAnchor, CFX_RectF &rtPopup) = 0; diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h index 6f8170ff5c..323a0ba4fc 100644 --- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h +++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h @@ -31,7 +31,7 @@ public: virtual FWL_ERR SetMinimize(IFWL_Widget *pWidget); virtual FWL_ERR RunWidget(IFWL_Widget *pWidget); virtual FWL_ERR RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect); - virtual FWL_ERR Exit(FX_INT32 iExitCode); + virtual FWL_ERR Exit(int32_t iExitCode); virtual FWL_ERR CreateWidgetWithNativeId(IFWL_Widget *pWidget, void *vp); virtual FX_BOOL GetPopupPos(IFWL_Widget* pWidget, FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight, const CFX_RectF &rtAnchor, CFX_RectF &rtPopup); public: @@ -51,8 +51,8 @@ public: virtual FWL_ERR RunLoop(IFWL_Widget *widget); virtual FWL_ERR EndLoop(); virtual FWL_ERR InitMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData); - virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, FX_INT32 iType); - virtual FX_INT32 TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData); + virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, int32_t iType); + virtual int32_t TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData); virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook *hook); virtual FWL_ERR GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b); }; @@ -65,8 +65,8 @@ public: virtual FWL_ERR Start(IFWL_Thread *pThread, FWL_HTHREAD &hThread, FX_BOOL bSuspended = FALSE); virtual FWL_ERR Resume(FWL_HTHREAD hThread); virtual FWL_ERR Suspend(FWL_HTHREAD hThread); - virtual FWL_ERR Kill(FWL_HTHREAD hThread, FX_INT32 iExitCode); - virtual FWL_ERR Stop(FWL_HTHREAD hThread, FX_INT32 iExitCode); + virtual FWL_ERR Kill(FWL_HTHREAD hThread, int32_t iExitCode); + virtual FWL_ERR Stop(FWL_HTHREAD hThread, int32_t iExitCode); virtual IFWL_Thread* GetCurrentThread(); }; #endif -- cgit v1.2.3