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

xfa/src/fee/src/fee/fde_txtedtbuf.h

Index: xfa/src/fee/src/fee/fde_txtedtbuf.h
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h
index 7a9100c833be30d8e69fc02b38cf537b380c933f..9e54a0d2f3af8b9e832fe50d21319817811e42d5 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.h
+++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h
@@ -21,21 +21,21 @@ public:
     virtual void		Release();
     virtual FX_BOOL		Next(FX_BOOL bPrev = FALSE);
     virtual FX_WCHAR	GetChar();
-    virtual void		SetAt(FX_INT32 nIndex);
-    virtual FX_INT32	GetAt() const;
+    virtual void		SetAt(int32_t nIndex);
+    virtual int32_t	GetAt() const;
     virtual FX_BOOL		IsEOF(FX_BOOL bTail = TRUE) const;
     virtual IFX_CharIter * Clone();
 protected:
     ~CFDE_TxtEdtBufIter();
 private:
     CFDE_TxtEdtBuf*	m_pBuf;
-    FX_INT32		m_nCurChunk;
-    FX_INT32		m_nCurIndex;
-    FX_INT32		m_nIndex;
+    int32_t		m_nCurChunk;
+    int32_t		m_nCurIndex;
+    int32_t		m_nIndex;
     FX_BOOL			m_bInField;
 #ifdef FDE_USEFORMATBLOCK
     FX_BOOL			m_bForDisplay;
-    FX_INT32		m_nAliasCount;
+    int32_t		m_nAliasCount;
 #endif
     FX_WCHAR		m_Alias;
 };
@@ -43,32 +43,32 @@ class CFDE_TxtEdtBuf : public IFDE_TxtEdtBuf
 {
     friend class CFDE_TxtEdtBufIter;
     struct _FDE_CHUNKHEADER {
-        FX_INT32	nUsed;
+        int32_t	nUsed;
         FX_WCHAR	wChars[1];
     };
     typedef _FDE_CHUNKHEADER	FDE_CHUNKHEADER;
     typedef _FDE_CHUNKHEADER*	FDE_LPCHUNKHEADER;
     struct _FDE_CHUNKPLACE {
-        FX_INT32	nChunkIndex;
-        FX_INT32	nCharIndex;
+        int32_t	nChunkIndex;
+        int32_t	nCharIndex;
     };
     typedef _FDE_CHUNKPLACE		FDE_CHUNKPLACE;
     typedef _FDE_CHUNKPLACE*	FDE_LPCHUNKPLACE;
 
 public:
-    CFDE_TxtEdtBuf(FX_INT32 nDefChunkSize = FDE_DEFCHUNKLENGTH);
+    CFDE_TxtEdtBuf(int32_t nDefChunkSize = FDE_DEFCHUNKLENGTH);
 
     virtual	void		Release();
-    virtual FX_BOOL		SetChunkSize(FX_INT32 nChunkSize);
-    virtual FX_INT32	GetChunkSize() const;
-    virtual	FX_INT32	GetTextLength() const;
+    virtual FX_BOOL		SetChunkSize(int32_t nChunkSize);
+    virtual int32_t	GetChunkSize() const;
+    virtual	int32_t	GetTextLength() const;
     virtual void		SetText(const CFX_WideString &wsText);
     virtual void		GetText(CFX_WideString &wsText) const;
-    virtual FX_WCHAR	GetCharByIndex(FX_INT32 nIndex) const;
-    virtual void		GetRange(CFX_WideString &wsText, FX_INT32 nBegine, FX_INT32 nCount = -1) const;
+    virtual FX_WCHAR	GetCharByIndex(int32_t nIndex) const;
+    virtual void		GetRange(CFX_WideString &wsText, int32_t nBegine, int32_t nCount = -1) const;
 
-    virtual void		Insert(FX_INT32 nPos, FX_LPCWSTR lpText, FX_INT32 nLength = 1);
-    virtual void		Delete(FX_INT32 nIndex, FX_INT32 nLength = 1);
+    virtual void		Insert(int32_t nPos, FX_LPCWSTR lpText, int32_t nLength = 1);
+    virtual void		Delete(int32_t nIndex, int32_t nLength = 1);
     virtual void		Clear(FX_BOOL bRelease = TRUE);
 
     virtual FX_BOOL		Optimize(IFX_Pause * pPause = NULL);
@@ -76,13 +76,13 @@ public:
 protected:
     virtual ~CFDE_TxtEdtBuf();
 private:
-    void		ResetChunkBuffer(FX_INT32 nDefChunkCount, FX_INT32 nChunkSize);
-    FX_INT32	CP2Index(const FDE_CHUNKPLACE & cp) const;
-    void		Index2CP(FX_INT32 nIndex, FDE_CHUNKPLACE & cp) const;
+    void		ResetChunkBuffer(int32_t nDefChunkCount, int32_t nChunkSize);
+    int32_t	CP2Index(const FDE_CHUNKPLACE & cp) const;
+    void		Index2CP(int32_t nIndex, FDE_CHUNKPLACE & cp) const;
 
-    FX_INT32			m_nChunkSize;
+    int32_t			m_nChunkSize;
 
-    FX_INT32			m_nTotal;
+    int32_t			m_nTotal;
     FX_BOOL				m_bChanged;
     CFX_PtrArray		m_Chunks;
     IFX_MEMAllocator *	m_pAllocator;