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

4 files changed, 64 insertions, 64 deletions

diff --git a/xfa/src/fee/include/fx_wordbreak.h b/xfa/src/fee/include/fx_wordbreak.h
index c91aca694a..275930a8b7 100644
--- a/xfa/src/fee/include/fx_wordbreak.h
+++ b/xfa/src/fee/include/fx_wordbreak.h
@@ -14,9 +14,9 @@ public:
     virtual void		Attach(IFX_CharIter * pIter) = 0;

     virtual void		Attach(const CFX_WideString & wsText) = 0;

     virtual FX_BOOL		Next(FX_BOOL bPrev) = 0;

-    virtual void		SetAt(FX_INT32 nIndex) = 0;

-    virtual FX_INT32	GetWordPos() const = 0;

-    virtual FX_INT32	GetWordLength() const = 0;

+    virtual void		SetAt(int32_t nIndex) = 0;

+    virtual int32_t	GetWordPos() const = 0;

+    virtual int32_t	GetWordLength() const = 0;

     virtual void		GetWord(CFX_WideString &wsWord) const = 0;

     virtual FX_BOOL		IsEOF(FX_BOOL bTail = TRUE) const = 0;

 };

diff --git a/xfa/src/fee/include/ifde_txtedtbuf.h b/xfa/src/fee/include/ifde_txtedtbuf.h
index 6cfc3ec977..921b17a518 100644
--- a/xfa/src/fee/include/ifde_txtedtbuf.h
+++ b/xfa/src/fee/include/ifde_txtedtbuf.h
@@ -13,16 +13,16 @@ class IFDE_TxtEdtBuf
 public:

     virtual void		Release() = 0;

 

-    virtual FX_BOOL		SetChunkSize(FX_INT32 nChunkSize) = 0;

-    virtual FX_INT32	GetChunkSize() const = 0;

-    virtual FX_INT32	GetTextLength() const = 0;

+    virtual FX_BOOL		SetChunkSize(int32_t nChunkSize) = 0;

+    virtual int32_t	GetChunkSize() const = 0;

+    virtual int32_t	GetTextLength() const = 0;

     virtual void		SetText(const CFX_WideString &wsText) = 0;

     virtual void		GetText(CFX_WideString &wsText) const = 0;

-    virtual FX_WCHAR	GetCharByIndex(FX_INT32 nIndex) const = 0;

-    virtual void		GetRange(CFX_WideString &wsText, FX_INT32 nBegin, FX_INT32 nCount = - 1) const = 0;

+    virtual FX_WCHAR	GetCharByIndex(int32_t nIndex) const = 0;

+    virtual void		GetRange(CFX_WideString &wsText, int32_t nBegin, int32_t nCount = - 1) const = 0;

 

-    virtual void		Insert(FX_INT32 nPos, FX_LPCWSTR lpText, FX_INT32 nLength = 1) = 0;

-    virtual void		Delete(FX_INT32 nIndex, FX_INT32 nLength = 1) = 0;

+    virtual void		Insert(int32_t nPos, FX_LPCWSTR lpText, int32_t nLength = 1) = 0;

+    virtual void		Delete(int32_t nIndex, int32_t nLength = 1) = 0;

 

     virtual void		Clear(FX_BOOL bRelease = TRUE) = 0;

 

diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h
index 5c16696845..10f90881bd 100644
--- a/xfa/src/fee/include/ifde_txtedtengine.h
+++ b/xfa/src/fee/include/ifde_txtedtengine.h
@@ -104,7 +104,7 @@ struct _FDE_TXTEDTPARAMS {
     }

     FX_FLOAT	fPlateWidth;

     FX_FLOAT	fPlateHeight;

-    FX_INT32	nLineCount;

+    int32_t	nLineCount;

     FX_DWORD	dwLayoutStyles;

     FX_DWORD	dwAlignment;

     FX_DWORD	dwMode;

@@ -116,9 +116,9 @@ struct _FDE_TXTEDTPARAMS {
     FX_BOOL		bTabEquidistant;

     FX_WCHAR	wDefChar;

     FX_WCHAR	wLineBreakChar;

-    FX_INT32	nCharRotation;

-    FX_INT32	nLineEnd;

-    FX_INT32	nHorzScale;

+    int32_t	nCharRotation;

+    int32_t	nLineEnd;

+    int32_t	nHorzScale;

     FX_FLOAT	fCharSpace;

     IFDE_TxtEdtEventSink * pEventSink;

 };

@@ -130,7 +130,7 @@ enum FDE_TXTEDT_TEXTCHANGE_TYPE {
     FDE_TXTEDT_TEXTCHANGE_TYPE_Replace		,

 };

 struct _FDE_TXTEDT_TEXTCHANGE_INFO {

-    FX_INT32		nChangeType;

+    int32_t		nChangeType;

     CFX_WideString	wsInsert;

     CFX_WideString	wsDelete;

     CFX_WideString  wsPrevText;

@@ -140,18 +140,18 @@ typedef _FDE_TXTEDT_TEXTCHANGE_INFO*	FDE_LPTXTEDT_TEXTCHANGE_INFO;
 class IFDE_TxtEdtEventSink

 {

 public:

-    virtual void	On_CaretChanged(IFDE_TxtEdtEngine * pEdit, FX_INT32 nPage, FX_BOOL bVisible = TRUE) = 0;

+    virtual void	On_CaretChanged(IFDE_TxtEdtEngine * pEdit, int32_t nPage, FX_BOOL bVisible = TRUE) = 0;

     virtual void	On_TextChanged(IFDE_TxtEdtEngine * pEdit, FDE_TXTEDT_TEXTCHANGE_INFO &ChangeInfo) = 0;

     virtual void	On_PageCountChanged(IFDE_TxtEdtEngine * pEdit) = 0;

     virtual void	On_SelChanged(IFDE_TxtEdtEngine * pEdit) = 0;

-    virtual FX_BOOL	On_PageLoad(IFDE_TxtEdtEngine * pEdit, FX_INT32 nPageIndex, FX_INT32 nPurpose) = 0;

-    virtual FX_BOOL	On_PageUnload(IFDE_TxtEdtEngine * pEdit, FX_INT32 nPageIndex, FX_INT32 nPurpose) = 0;

-    virtual FX_BOOL	On_PageChange(IFDE_TxtEdtEngine * pEdit, FX_INT32 nPageIndex) = 0;

+    virtual FX_BOOL	On_PageLoad(IFDE_TxtEdtEngine * pEdit, int32_t nPageIndex, int32_t nPurpose) = 0;

+    virtual FX_BOOL	On_PageUnload(IFDE_TxtEdtEngine * pEdit, int32_t nPageIndex, int32_t nPurpose) = 0;

+    virtual FX_BOOL	On_PageChange(IFDE_TxtEdtEngine * pEdit, int32_t nPageIndex) = 0;

     virtual void	On_AddDoRecord(IFDE_TxtEdtEngine * pEdit, FX_BSTR bsDoRecord) = 0;

-    virtual FX_BOOL On_ValidateField(IFDE_TxtEdtEngine * pEdit, FX_INT32 nBlockIndex, FX_INT32 nFieldIndex, \

-                                     const CFX_WideString &wsFieldText, FX_INT32 nCharIndex) = 0;

-    virtual FX_BOOL On_ValidateBlock(IFDE_TxtEdtEngine * pEdit, FX_INT32 nBlockIndex) = 0;

-    virtual FX_BOOL On_GetBlockFormatText(IFDE_TxtEdtEngine * pEdit, FX_INT32 nBlockIndex, CFX_WideString &wsBlockText) = 0;

+    virtual FX_BOOL On_ValidateField(IFDE_TxtEdtEngine * pEdit, int32_t nBlockIndex, int32_t nFieldIndex, \

+                                     const CFX_WideString &wsFieldText, int32_t nCharIndex) = 0;

+    virtual FX_BOOL On_ValidateBlock(IFDE_TxtEdtEngine * pEdit, int32_t nBlockIndex) = 0;

+    virtual FX_BOOL On_GetBlockFormatText(IFDE_TxtEdtEngine * pEdit, int32_t nBlockIndex, CFX_WideString &wsBlockText) = 0;

     virtual FX_BOOL On_Validate(IFDE_TxtEdtEngine * pEdit, CFX_WideString &wsText) = 0;

 };

 class IFX_CharIter

@@ -160,8 +160,8 @@ public:
     virtual void		Release() = 0;

     virtual FX_BOOL		Next(FX_BOOL bPrev = FALSE) = 0;

     virtual FX_WCHAR	GetChar() = 0;

-    virtual void		SetAt(FX_INT32 nIndex) = 0;

-    virtual FX_INT32	GetAt() const = 0;

+    virtual void		SetAt(int32_t nIndex) = 0;

+    virtual int32_t	GetAt() const = 0;

     virtual FX_BOOL		IsEOF(FX_BOOL bTail = TRUE) const = 0;

     virtual IFX_CharIter * Clone() = 0;

 };

@@ -174,60 +174,60 @@ public:
     virtual void					SetEditParams(const FDE_TXTEDTPARAMS &params) = 0;

     virtual const FDE_TXTEDTPARAMS* GetEditParams() const = 0;

 

-    virtual FX_INT32				CountPages() const = 0;

-    virtual IFDE_TxtEdtPage*		GetPage(FX_INT32 nIndex) = 0;

-    virtual FX_BOOL					SetBufChunkSize(FX_INT32 nChunkSize) = 0;

+    virtual int32_t				CountPages() const = 0;

+    virtual IFDE_TxtEdtPage*		GetPage(int32_t nIndex) = 0;

+    virtual FX_BOOL					SetBufChunkSize(int32_t nChunkSize) = 0;

     virtual void		SetTextByStream(IFX_Stream * pStream) = 0;

     virtual void					SetText(const CFX_WideString &wsText) = 0;

-    virtual FX_INT32				GetTextLength() const = 0;

-    virtual void					GetText(CFX_WideString &wsText, FX_INT32 nStart, FX_INT32 nCount = -1) = 0;

+    virtual int32_t				GetTextLength() const = 0;

+    virtual void					GetText(CFX_WideString &wsText, int32_t nStart, int32_t nCount = -1) = 0;

     virtual void					ClearText() = 0;

 

-    virtual FX_INT32				GetCaretRect(CFX_RectF &rtCaret) const = 0;

-    virtual FX_INT32				GetCaretPos() const = 0;

-    virtual FX_INT32				SetCaretPos(FX_INT32 nIndex, FX_BOOL bBefore = TRUE) = 0;

-    virtual FX_INT32				MoveCaretPos(FDE_TXTEDTMOVECARET eMoveCaret, FX_BOOL bShift = FALSE, FX_BOOL bCtrl = FALSE) = 0;

+    virtual int32_t				GetCaretRect(CFX_RectF &rtCaret) const = 0;

+    virtual int32_t				GetCaretPos() const = 0;

+    virtual int32_t				SetCaretPos(int32_t nIndex, FX_BOOL bBefore = TRUE) = 0;

+    virtual int32_t				MoveCaretPos(FDE_TXTEDTMOVECARET eMoveCaret, FX_BOOL bShift = FALSE, FX_BOOL bCtrl = FALSE) = 0;

 

     virtual void					Lock() = 0;

     virtual void					Unlock() = 0;

     virtual FX_BOOL					IsLocked() const = 0;

 

-    virtual FX_INT32				Insert(FX_INT32 nStart, FX_LPCWSTR lpText, FX_INT32 nLength) = 0;

-    virtual FX_INT32				Delete(FX_INT32 nStart, FX_BOOL bBackspace = FALSE) = 0;

-    virtual FX_INT32				DeleteRange(FX_INT32 nStart, FX_INT32 nCount = -1) = 0;

-    virtual FX_INT32				Replace(FX_INT32 nStart, FX_INT32 nLength, const CFX_WideString &wsReplace) = 0;

-    virtual void					SetLimit(FX_INT32 nLimit) = 0;

+    virtual int32_t				Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLength) = 0;

+    virtual int32_t				Delete(int32_t nStart, FX_BOOL bBackspace = FALSE) = 0;

+    virtual int32_t				DeleteRange(int32_t nStart, int32_t nCount = -1) = 0;

+    virtual int32_t				Replace(int32_t nStart, int32_t nLength, const CFX_WideString &wsReplace) = 0;

+    virtual void					SetLimit(int32_t nLimit) = 0;

     virtual void					SetAliasChar(FX_WCHAR wAlias) = 0;

-    virtual void					SetFormatBlock(FX_INT32 nIndex, const CFX_WideString &wsBlockFormat) = 0;

-    virtual FX_INT32				CountEditBlocks() const = 0;

-    virtual void					GetEditBlockText(FX_INT32 nIndex, CFX_WideString &wsBlockText) const = 0;

-    virtual FX_INT32				CountEditFields(FX_INT32 nBlockIndex) const = 0;

-    virtual void					GetEditFieldText(FX_INT32 nBlockIndex, FX_INT32 nFieldIndex, CFX_WideString &wsFieldText) const = 0;

+    virtual void					SetFormatBlock(int32_t nIndex, const CFX_WideString &wsBlockFormat) = 0;

+    virtual int32_t				CountEditBlocks() const = 0;

+    virtual void					GetEditBlockText(int32_t nIndex, CFX_WideString &wsBlockText) const = 0;

+    virtual int32_t				CountEditFields(int32_t nBlockIndex) const = 0;

+    virtual void					GetEditFieldText(int32_t nBlockIndex, int32_t nFieldIndex, CFX_WideString &wsFieldText) const = 0;

     virtual void					StartEdit() = 0;

     virtual void					EndEdit() = 0;

-    virtual void					AddSelRange(FX_INT32 nStart, FX_INT32 nCount = -1) = 0;

-    virtual FX_INT32				CountSelRanges() = 0;

-    virtual FX_INT32				GetSelRange(FX_INT32 nIndex, FX_INT32 &nStart) = 0;

+    virtual void					AddSelRange(int32_t nStart, int32_t nCount = -1) = 0;

+    virtual int32_t				CountSelRanges() = 0;

+    virtual int32_t				GetSelRange(int32_t nIndex, int32_t &nStart) = 0;

     virtual void					ClearSelection() = 0;

 

     virtual FX_BOOL					Redo(FX_BSTR bsRedo) = 0;

     virtual FX_BOOL					Undo(FX_BSTR bsUndo) = 0;

 

-    virtual FX_INT32				StartLayout() = 0;

-    virtual FX_INT32				DoLayout(IFX_Pause *pPause) = 0;

+    virtual int32_t				StartLayout() = 0;

+    virtual int32_t				DoLayout(IFX_Pause *pPause) = 0;

     virtual void					EndLayout() = 0;

 

     virtual FX_BOOL					Optimize(IFX_Pause * pPause = NULL) = 0;

-    virtual FX_INT32				CountParags() const = 0;

-    virtual IFDE_TxtEdtParag*		GetParag(FX_INT32 nParagIndex) const = 0;

+    virtual int32_t				CountParags() const = 0;

+    virtual IFDE_TxtEdtParag*		GetParag(int32_t nParagIndex) const = 0;

     virtual IFX_CharIter*			CreateCharIter() = 0;

 };

 class IFDE_TxtEdtParag

 {

 public:

-    virtual FX_INT32			GetTextLength() const = 0;

-    virtual	FX_INT32			GetStartIndex() const = 0;

-    virtual FX_INT32			CountLines() const = 0;

-    virtual void				GetLineRange(FX_INT32 nLineIndex, FX_INT32& nStart, FX_INT32& nCount) const = 0;

+    virtual int32_t			GetTextLength() const = 0;

+    virtual	int32_t			GetStartIndex() const = 0;

+    virtual int32_t			CountLines() const = 0;

+    virtual void				GetLineRange(int32_t nLineIndex, int32_t& nStart, int32_t& nCount) const = 0;

 };

 #endif

diff --git a/xfa/src/fee/include/ifde_txtedtpage.h b/xfa/src/fee/include/ifde_txtedtpage.h
index 7555434f5f..4e6c859793 100644
--- a/xfa/src/fee/include/ifde_txtedtpage.h
+++ b/xfa/src/fee/include/ifde_txtedtpage.h
@@ -11,21 +11,21 @@ class IFDE_TxtEdtPage;
 class IFDE_TxtEdtPage : public IFDE_CanvasSet, public IFX_TxtAccess

 {

 public:

-    static IFDE_TxtEdtPage * Create(IFDE_TxtEdtEngine * pEngine, FX_INT32 nIndex);

+    static IFDE_TxtEdtPage * Create(IFDE_TxtEdtEngine * pEngine, int32_t nIndex);

 

     virtual void				Release() = 0;

 

     virtual IFDE_TxtEdtEngine * GetEngine() const = 0;

-    virtual FX_INT32	GetCharRect(FX_INT32 nIndex, CFX_RectF &rect, FX_BOOL bBBox = FALSE) const = 0;

-    virtual FX_INT32	GetCharIndex(const CFX_PointF &fPoint, FX_BOOL &bBefore) = 0;

-    virtual void		CalcRangeRectArray(FX_INT32 nStart, FX_INT32 nCount, CFX_RectFArray &RectFArr) const = 0;

-    virtual FX_INT32	SelectWord (const CFX_PointF &fPoint, FX_INT32 &nCount) = 0;

-    virtual FX_INT32	GetCharStart() const = 0;

-    virtual FX_INT32	GetCharCount() const = 0;

+    virtual int32_t	GetCharRect(int32_t nIndex, CFX_RectF &rect, FX_BOOL bBBox = FALSE) const = 0;

+    virtual int32_t	GetCharIndex(const CFX_PointF &fPoint, FX_BOOL &bBefore) = 0;

+    virtual void		CalcRangeRectArray(int32_t nStart, int32_t nCount, CFX_RectFArray &RectFArr) const = 0;

+    virtual int32_t	SelectWord (const CFX_PointF &fPoint, int32_t &nCount) = 0;

+    virtual int32_t	GetCharStart() const = 0;

+    virtual int32_t	GetCharCount() const = 0;

 

-    virtual FX_INT32	GetDisplayPos(const CFX_RectF &rtClip, FXTEXT_CHARPOS* &pCharPos, FX_LPRECTF pBBox = NULL) const = 0;

+    virtual int32_t	GetDisplayPos(const CFX_RectF &rtClip, FXTEXT_CHARPOS* &pCharPos, FX_LPRECTF pBBox = NULL) const = 0;

     virtual FX_BOOL				IsLoaded(FX_LPCRECTF pClipBox = NULL) = 0;

-    virtual FX_INT32			LoadPage(FX_LPCRECTF pClipBox = NULL, IFX_Pause *pPause = NULL) = 0;

+    virtual int32_t			LoadPage(FX_LPCRECTF pClipBox = NULL, IFX_Pause *pPause = NULL) = 0;

     virtual void				UnloadPage(FX_LPCRECTF pClipBox = NULL) = 0;

     virtual const CFX_RectF&		GetContentsBox() = 0;

 };