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/core/fwl_app.h | 2 +- xfa/include/fwl/core/fwl_content.h | 2 +- xfa/include/fwl/core/fwl_error.h | 2 +- xfa/include/fwl/core/fwl_grid.h | 16 ++++++++-------- xfa/include/fwl/core/fwl_note.h | 18 +++++++++--------- xfa/include/fwl/core/fwl_theme.h | 4 ++-- xfa/include/fwl/core/fwl_thread.h | 10 +++++----- xfa/include/fwl/core/fwl_timer.h | 4 ++-- xfa/include/fwl/core/fwl_widget.h | 2 +- xfa/include/fwl/core/fwl_widgetmgr.h | 10 +++++----- 10 files changed, 35 insertions(+), 35 deletions(-) (limited to 'xfa/include/fwl/core') diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h index 89f6309a31..b0cb1857e4 100644 --- a/xfa/include/fwl/core/fwl_app.h +++ b/xfa/include/fwl/core/fwl_app.h @@ -22,7 +22,7 @@ public: virtual IFWL_AdapterNative* GetAdapterNative() = 0; virtual IFWL_WidgetMgr* GetWidgetMgr() = 0; virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) = 0; - virtual FWL_ERR Exit(FX_INT32 iExitCode = 0) = 0; + virtual FWL_ERR Exit(int32_t iExitCode = 0) = 0; }; IFWL_App* FWL_GetApp(); void FWL_SetApp(IFWL_App *pApp); diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h index 51d5e9e8df..4a00154ef3 100644 --- a/xfa/include/fwl/core/fwl_content.h +++ b/xfa/include/fwl/core/fwl_content.h @@ -13,7 +13,7 @@ class IFWL_Content : public IFWL_Widget public: static IFWL_Content* Create(); FWL_ERR Initialize(); - FWL_ERR InsertWidget(IFWL_Widget *pChild, FX_INT32 nIndex = -1); + FWL_ERR InsertWidget(IFWL_Widget *pChild, int32_t nIndex = -1); FWL_ERR RemoveWidget(IFWL_Widget *pWidget); FWL_ERR RemoveAllWidgets(); FWL_ERR GetMinSize(FX_FLOAT &fWidth, FX_FLOAT &fHeight); diff --git a/xfa/include/fwl/core/fwl_error.h b/xfa/include/fwl/core/fwl_error.h index d790bee5ac..465808a116 100644 --- a/xfa/include/fwl/core/fwl_error.h +++ b/xfa/include/fwl/core/fwl_error.h @@ -6,7 +6,7 @@ #ifndef _FWL_ERROR_H #define _FWL_ERROR_H -typedef FX_INT32 FWL_ERR; +typedef int32_t FWL_ERR; #define FWL_ERR_Succeeded 0 #define FWL_ERR_Indefinite -1 #define FWL_ERR_Parameter_Invalid -100 diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h index e86c3dabe9..0d4e2d61f8 100644 --- a/xfa/include/fwl/core/fwl_grid.h +++ b/xfa/include/fwl/core/fwl_grid.h @@ -46,10 +46,10 @@ public: FWL_ERR Initialize(); FWL_ERR Initialize(CFWL_WidgetImpProperties &properties); - FWL_HGRIDCOLROW InsertColRow(FX_BOOL bColumn, FX_INT32 nIndex = -1); - FX_INT32 CountColRows(FX_BOOL bColumn); - FWL_HGRIDCOLROW GetColRow(FX_BOOL bColumn, FX_INT32 nIndex); - FX_INT32 GetIndex(FWL_HGRIDCOLROW hColRow); + FWL_HGRIDCOLROW InsertColRow(FX_BOOL bColumn, int32_t nIndex = -1); + int32_t CountColRows(FX_BOOL bColumn); + FWL_HGRIDCOLROW GetColRow(FX_BOOL bColumn, int32_t nIndex); + int32_t GetIndex(FWL_HGRIDCOLROW hColRow); FX_FLOAT GetSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT &eUnit); FWL_ERR SetSize(FWL_HGRIDCOLROW hColRow, FX_FLOAT fSize, FWL_GRIDUNIT eUnit); FX_FLOAT GetMinSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT &eUnit); @@ -58,10 +58,10 @@ public: FWL_ERR SetMaxSize(FWL_HGRIDCOLROW hColRow, FX_FLOAT fSize, FWL_GRIDUNIT eUnit); FX_BOOL DeleteColRow(FWL_HGRIDCOLROW hColRow); FX_BOOL IsColumn(FWL_HGRIDCOLROW hColRow); - FX_INT32 GetWidgetPos(IFWL_Widget *pWidget, FX_BOOL bColumn); - FWL_ERR SetWidgetPos(IFWL_Widget *pWidget, FX_INT32 iPos, FX_BOOL bColumn); - FX_INT32 GetWidgetSpan(IFWL_Widget *pWidget, FX_BOOL bColumn); - FWL_ERR SetWidgetSpan(IFWL_Widget *pWidget, FX_INT32 iSpan, FX_BOOL bColumn); + int32_t GetWidgetPos(IFWL_Widget *pWidget, FX_BOOL bColumn); + FWL_ERR SetWidgetPos(IFWL_Widget *pWidget, int32_t iPos, FX_BOOL bColumn); + int32_t GetWidgetSpan(IFWL_Widget *pWidget, FX_BOOL bColumn); + FWL_ERR SetWidgetSpan(IFWL_Widget *pWidget, int32_t iSpan, FX_BOOL bColumn); FX_FLOAT GetWidgetSize(IFWL_Widget *pWidget, FWL_GRIDSIZE eSize, FWL_GRIDUNIT &eUnit); FWL_ERR SetWidgetSize(IFWL_Widget *pWidget, FWL_GRIDSIZE eSize, FX_FLOAT fSize, FWL_GRIDUNIT eUit); FX_BOOL GetWidgetMargin(IFWL_Widget *pWidget, FWL_GRIDMARGIN eMargin, FX_FLOAT &fMargin); diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h index 1cc88a6593..7e553a9eb2 100644 --- a/xfa/include/fwl/core/fwl_note.h +++ b/xfa/include/fwl/core/fwl_note.h @@ -174,7 +174,7 @@ protected: { return TRUE; } - virtual FX_INT32 Finalize() + virtual int32_t Finalize() { return 0; } @@ -235,8 +235,8 @@ END_FWL_MESSAGE_DEF BEGIN_FWL_MESSAGE_DEF(CFWL_MsgCursor, FWL_MSGHASH_Cursor) END_FWL_MESSAGE_DEF BEGIN_FWL_MESSAGE_DEF(CFWL_MsgSize, FWL_MSGHASH_Size) -FX_INT32 m_iWidth; -FX_INT32 m_iHeight; +int32_t m_iWidth; +int32_t m_iHeight; END_FWL_MESSAGE_DEF BEGIN_FWL_MESSAGE_DEF(CFWL_MsgWindowMove, FWL_MSGHASH_WindowMove) FX_FLOAT m_fx; @@ -321,7 +321,7 @@ FX_FLOAT m_fPosY; IFWL_Widget *m_pOwner; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtMenuCommand, FWL_EVTHASH_MenuCommand) -FX_INT32 m_iCommand; +int32_t m_iCommand; FX_LPVOID m_pData; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtSizeChanged, FWL_EVTHASH_SizeChanged) @@ -351,8 +351,8 @@ public: virtual FWL_ERR RegisterEventTarget(IFWL_Widget *pListener, IFWL_Widget *pEventSource = NULL, FX_DWORD dwFilter = FWL_EVENT_ALL_MASK) = 0; virtual FWL_ERR UnregisterEventTarget(IFWL_Widget *pListener) = 0; virtual void ClearEventTargets(FX_BOOL bRemoveAll) = 0; - virtual FX_INT32 GetQueueMaxSize() const = 0; - virtual FWL_ERR SetQueueMaxSize(const FX_INT32 size) = 0; + virtual int32_t GetQueueMaxSize() const = 0; + virtual FWL_ERR SetQueueMaxSize(const int32_t size) = 0; virtual IFWL_NoteThread* GetOwnerThread() const = 0; virtual FWL_ERR PushNoteLoop(IFWL_NoteLoop *pNoteLoop) = 0; virtual IFWL_NoteLoop* PopNoteLoop() = 0; @@ -364,7 +364,7 @@ class IFWL_NoteLoop { public: virtual FX_BOOL PreProcessMessage(CFWL_Message *pMessage) = 0; - virtual FWL_ERR Idle(FX_INT32 count) = 0; + virtual FWL_ERR Idle(int32_t count) = 0; }; class IFWL_ToolTipTarget { @@ -382,8 +382,8 @@ public: }; FWL_ERR FWL_AddToolTipTarget(IFWL_ToolTipTarget *pTarget); FWL_ERR FWL_RemoveToolTipTarget(IFWL_ToolTipTarget *pTarget); -FWL_ERR FWL_SetToolTipInitialDelay(FX_INT32 iDelayTime); -FWL_ERR FWL_SetToolTipAutoPopDelay(FX_INT32 iDelayTime); +FWL_ERR FWL_SetToolTipInitialDelay(int32_t iDelayTime); +FWL_ERR FWL_SetToolTipAutoPopDelay(int32_t iDelayTime); typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message *msg, FX_LPVOID info); FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, FX_LPVOID info); #endif diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h index 59d5ab0a2a..cc29e351d1 100644 --- a/xfa/include/fwl/core/fwl_theme.h +++ b/xfa/include/fwl/core/fwl_theme.h @@ -42,7 +42,7 @@ public: CFX_Matrix m_matrix; CFX_RectF m_rtPart; IFWL_Widget *m_pWidget; - FX_INT32 m_iPart; + int32_t m_iPart; FX_DWORD m_dwStates; FX_DWORD m_dwData; FX_LPVOID m_pData; @@ -69,7 +69,7 @@ public: } CFX_WideString m_wsText; FX_DWORD m_dwTTOStyles; - FX_INT32 m_iTTOAlign; + int32_t m_iTTOAlign; CFX_Graphics *m_pGraphics; }; class IFWL_ThemeProvider diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h index 9ce742b368..9b001f4fcb 100644 --- a/xfa/include/fwl/core/fwl_thread.h +++ b/xfa/include/fwl/core/fwl_thread.h @@ -25,8 +25,8 @@ public: FWL_HTHREAD FWL_StartThread(IFWL_Thread *pThread, FX_BOOL bSuspended = FALSE); FWL_ERR FWL_ResumeThread(FWL_HTHREAD hThread); FWL_ERR FWL_SuspendThread(FWL_HTHREAD hThread); -FWL_ERR FWL_KillThread(FWL_HTHREAD hThread, FX_INT32 iExitCode); -FWL_ERR FWL_StopThread(FWL_HTHREAD hThread, FX_INT32 iExitCode); +FWL_ERR FWL_KillThread(FWL_HTHREAD hThread, int32_t iExitCode); +FWL_ERR FWL_StopThread(FWL_HTHREAD hThread, int32_t iExitCode); FWL_ERR FWL_Sleep(FX_DWORD dwMilliseconds); class IFWL_NoteThread : public IFWL_Thread { @@ -50,7 +50,7 @@ typedef struct _FWL_HSEMAPHORE { FWL_HSEMAPHORE FWL_CreateSemaphore(); FWL_ERR FWL_DestroySemaphore(FWL_HSEMAPHORE hSemaphore); FWL_ERR FWL_WaitSemaphore(FWL_HSEMAPHORE hSemaphore); -FWL_ERR FWL_PostSemaphore(FWL_HSEMAPHORE hSemaphore, FX_INT32 down = 1); -FWL_ERR FWL_GetSemaphoreValue(FWL_HSEMAPHORE hSemaphore, FX_INT32 &value); -FWL_ERR FWL_ResetSemaphore(FWL_HSEMAPHORE hSemaphore, FX_INT32 init); +FWL_ERR FWL_PostSemaphore(FWL_HSEMAPHORE hSemaphore, int32_t down = 1); +FWL_ERR FWL_GetSemaphoreValue(FWL_HSEMAPHORE hSemaphore, int32_t &value); +FWL_ERR FWL_ResetSemaphore(FWL_HSEMAPHORE hSemaphore, int32_t init); #endif diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h index 3e83c299ff..a71cff72be 100644 --- a/xfa/include/fwl/core/fwl_timer.h +++ b/xfa/include/fwl/core/fwl_timer.h @@ -13,8 +13,8 @@ typedef struct _FWL_HTIMER { class IFWL_Timer { public: - virtual FX_INT32 Run(FWL_HTIMER hTimer) = 0; + virtual int32_t Run(FWL_HTIMER hTimer) = 0; }; FWL_HTIMER FWL_StartTimer(IFWL_Timer *pTimer, FX_DWORD dwElapse, FX_BOOL bImmediately = TRUE); -FX_INT32 FWL_StopTimer(FWL_HTIMER hTimer); +int32_t FWL_StopTimer(FWL_HTIMER hTimer); #endif diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h index 3127f0683d..c7ef2d48ca 100644 --- a/xfa/include/fwl/core/fwl_widget.h +++ b/xfa/include/fwl/core/fwl_widget.h @@ -59,7 +59,7 @@ public: class IFWL_WidgetDelegate { public: - virtual FX_INT32 OnProcessMessage(CFWL_Message *pMessage) = 0; + virtual int32_t OnProcessMessage(CFWL_Message *pMessage) = 0; virtual FWL_ERR OnProcessEvent(CFWL_Event *pEvent) = 0; virtual FWL_ERR OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL) = 0; }; diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/include/fwl/core/fwl_widgetmgr.h index 8db4f34503..9fcb4b682c 100644 --- a/xfa/include/fwl/core/fwl_widgetmgr.h +++ b/xfa/include/fwl/core/fwl_widgetmgr.h @@ -23,11 +23,11 @@ enum FWL_WGTRELATION { class IFWL_WidgetMgr { public: - virtual FX_INT32 CountWidgets(IFWL_Widget *pParent = NULL) = 0; - virtual IFWL_Widget* GetWidget(FX_INT32 nIndex, IFWL_Widget *pParent = NULL) = 0; + virtual int32_t CountWidgets(IFWL_Widget *pParent = NULL) = 0; + virtual IFWL_Widget* GetWidget(int32_t nIndex, IFWL_Widget *pParent = NULL) = 0; virtual IFWL_Widget* GetWidget(IFWL_Widget *pWidget, FWL_WGTRELATION eRelation) = 0; - virtual FX_INT32 GetWidgetIndex(IFWL_Widget *pWidget) = 0; - virtual FX_BOOL SetWidgetIndex(IFWL_Widget *pWidget, FX_INT32 nIndex) = 0; + virtual int32_t GetWidgetIndex(IFWL_Widget *pWidget) = 0; + virtual FX_BOOL SetWidgetIndex(IFWL_Widget *pWidget, int32_t nIndex) = 0; virtual FX_BOOL IsWidget(FX_LPVOID pObj) = 0; virtual FWL_ERR RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect = NULL) = 0; virtual FX_DWORD GetCapability() = 0; @@ -40,7 +40,7 @@ class IFWL_WidgetMgrDelegate { public: virtual FWL_ERR OnSetCapability(FX_DWORD dwCapability = FWL_WGTMGR_DisableThread) = 0; - virtual FX_INT32 OnProcessMessageToForm(CFWL_Message *pMessage) = 0; + virtual int32_t OnProcessMessageToForm(CFWL_Message *pMessage) = 0; virtual FWL_ERR OnDrawWidget(IFWL_Widget *pWidget, CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL) = 0; }; FWL_ERR FWL_WidgetMgrSnapshot(IFWL_Widget *pWidget, const CFX_WideString *saveFile, const CFX_Matrix *pMatrix = NULL); -- cgit v1.2.3