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

core/src/reflow/reflowedpage.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_SRC_REFLOW_REFLOWEDPAGE_H_
 #define CORE_SRC_REFLOW_REFLOWEDPAGE_H_
 
 #include "../../include/reflow/reflowengine.h"
@@ skipping 30 matching lines @@
     void        FitPageMode();
     void        ProcessElement(IPDF_LayoutElement* pElement, FX_FLOAT reflowWidth);
     FX_FLOAT GetElmWidth(IPDF_LayoutElement* pElement);
     CFX_FloatRect GetElmBBox(IPDF_LayoutElement* pElement);
     void        ProcessTable(FX_FLOAT dx);
     void        ProcessObjs(IPDF_LayoutElement* pElement, FX_FLOAT reflowWidth);
     void        ProcessObject(CPDF_PageObject* pObj, FX_FLOAT reflowWidth, CFX_AffineMatrix objMatrix);
     void        ProcessTextObject(CPDF_TextObject *pObj, FX_FLOAT reflowWidth, CFX_AffineMatrix objMatrix);
     void        ProcessPathObject(CPDF_PathObject *pObj, FX_FLOAT reflowWidth);
     void        ProcessUnitaryObjs(CPDF_PageObjects *pObjs, FX_FLOAT reflowWidth, CFX_AffineMatrix objMatrix);
-    FX_INT32 LogicPreObj(CPDF_TextObject* pObj);
+    int32_t LogicPreObj(CPDF_TextObject* pObj);
     int ProcessInsertObject(CPDF_TextObject* pObj, CFX_AffineMatrix formMatrix);
     FX_WCHAR GetPreChar();
     FX_BOOL IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2);
     int GetCharWidth(FX_DWORD charCode, CPDF_Font* pFont) const;
     FX_BOOL     IsCanBreakAfter(FX_DWORD unicode);
     FX_BOOL     IsCanBreakBefore(FX_DWORD unicode);
-    FX_INT32 GetElementTypes(LayoutType layoutType);
+    int32_t GetElementTypes(LayoutType layoutType);
     void                                CreateRFData(CPDF_PageObject* pObj, CFX_AffineMatrix* pMatrix = NULL);
     CRF_CharState*              GetCharState(CPDF_TextObject* pObj, CPDF_Font* pFont, FX_FLOAT fHeight, FX_ARGB color);
     FX_FLOAT            ConverWidth(FX_FLOAT width);
     void        AddData2CurrLine(CRF_Data* pData);
     void        AddTemp2CurrLine(int begin, int count );
     void        Transform(const CFX_AffineMatrix* pMatrix, CRF_Data* pData);
     void        Transform(const CFX_AffineMatrix* pMatrix, CRF_DataPtrArray* pDataArray, int beginPos, int count = 0);
     FX_FLOAT GetDatasWidth( int beginPos, int endpos);
     void        UpdateCurrLine();
     FX_BOOL     FinishedCurrLine();
@@ skipping 93 matching lines @@
 class CPDF_ReflowedPage : public IPDF_ReflowedPage, public CFX_PrivateData
 {
 public:
 
     CPDF_ReflowedPage(CFX_GrowOnlyPool* pMemoryPool);
     ~CPDF_ReflowedPage();
     CFX_PrivateData*    GetPrivateDataCtrl()
     {
         return this;
     };
-    void                GetDisplayMatrix(CFX_AffineMatrix& matrix, FX_INT32 xPos, FX_INT32 yPos, FX_INT32 xSize, FX_INT32 ySize, FX_INT32 iRotate, const CFX_AffineMatrix* pPageMatrix);
+    void                GetDisplayMatrix(CFX_AffineMatrix& matrix, int32_t xPos, int32_t yPos, int32_t xSize, int32_t ySize, int32_t iRotate, const CFX_AffineMatrix* pPageMatrix);
 
     FX_FLOAT    GetPageHeight() ;
     FX_FLOAT    GetPageWidth()
     {
         return m_PageWidth;
     };
-    void                FocusGetData(const CFX_AffineMatrix matrix, FX_INT32 x, FX_INT32 y, CFX_ByteString& str);
-    FX_BOOL             FocusGetPosition(const CFX_AffineMatrix matrix, CFX_ByteString str, FX_INT32& x, FX_INT32& y);
+    void                FocusGetData(const CFX_AffineMatrix matrix, int32_t x, int32_t y, CFX_ByteString& str);
+    FX_BOOL             FocusGetPosition(const CFX_AffineMatrix matrix, CFX_ByteString str, int32_t& x, int32_t& y);
     CRF_DataPtrArray*   m_pReflowed;
     FX_FLOAT                    m_PageWidth;
     FX_FLOAT                    m_PageHeight;
     FX_BOOL                             m_bWaiting;
     CRF_CharStateArray* m_pCharState;
     CFX_GrowOnlyPool*   m_pMemoryPool;
     FX_BOOL                             m_bCreateMemoryPool;
     CPDF_Page*                  m_pPDFPage;
     FX_BOOL                                     RetainPageObjsMemberShip();
     void                                        MarkPageObjMemberShip(CPDF_PageObject* pObj, CRF_PageInfo* pParent);
@@ skipping 174 matching lines @@
     FX_BOOL                     m_bDecoration;
     CPDF_Path                   m_pPathData;
     CFX_AffineMatrix    m_pPath2Device;
     CPDF_GraphState             m_pGraphState;
     FX_ARGB             m_fill_argb;
     FX_ARGB             m_stroke_argb;
     int                 m_fill_mode;
 };
 
 #endif  // CORE_SRC_REFLOW_REFLOWEDPAGE_H_