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/lightwidget/widget.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/include/fwl/lightwidget/widget.h') diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index 222ce1c768..d581c7fb40 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -83,7 +83,7 @@ public: virtual ~CFWL_Widget(); void RegisterEventTarget(CFWL_Widget *pEventSource = NULL, FX_DWORD dwFilter = FWL_EVENT_ALL_MASK); void DispatchEvent(CFWL_Event *pEvent); - CFX_SizeF CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine = FALSE, FX_INT32 iLineWidth = -1); + CFX_SizeF CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine = FALSE, int32_t iLineWidth = -1); IFWL_Widget *m_pImp; IFWL_WidgetDelegate *m_pDelegate; CFWL_WidgetMgr *m_pWidgetMgr; @@ -94,7 +94,7 @@ class CFWL_WidgetDelegate public: CFWL_WidgetDelegate(); virtual ~CFWL_WidgetDelegate(); - virtual FX_INT32 OnProcessMessage(CFWL_Message *pMessage); + virtual int32_t OnProcessMessage(CFWL_Message *pMessage); virtual FWL_ERR OnProcessEvent(CFWL_Event *pEvent); virtual FWL_ERR OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL); }; -- cgit v1.2.3