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

xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h

Index: xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
index 3555b0a4708e485de6ae34aae586f5fa1244ed55..39153ecfccc7104d3f1c4622b42c433931785b2f 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
@@ -31,9 +31,9 @@ public:
     CXFA_ScriptContext*			m_pSC;
     CXFA_Object*				m_CurNode;
     CFX_WideString				m_wsName;
-    FX_UINT32					m_uHashName;
+    uint32_t					m_uHashName;
     CFX_WideString				m_wsCondition;
-    FX_INT32					m_nLevel;
+    int32_t					m_nLevel;
     CXFA_ObjArray				m_Nodes;
     FX_DWORD					m_dwStyles;
     XFA_LPCSCRIPTATTRIBUTEINFO	m_pScriptAttribute;
@@ -44,22 +44,22 @@ class CXFA_ResolveProcessor
 public:
     CXFA_ResolveProcessor(void);
     ~CXFA_ResolveProcessor(void);
-    FX_INT32	XFA_ResolveNodes(CXFA_ResolveNodesData &rnd);
-    FX_INT32	XFA_ResolveNodes_AnyChild(CXFA_ResolveNodesData &rnd);
-    FX_INT32	XFA_ResolveNodes_Dollar(CXFA_ResolveNodesData &rnd);
-    FX_INT32	XFA_ResolveNodes_Excalmatory(CXFA_ResolveNodesData &rnd);
-    FX_INT32	XFA_ResolveNodes_NumberSign(CXFA_ResolveNodesData &rnd);
-    FX_INT32	XFA_ResolveNodes_Asterisk(CXFA_ResolveNodesData &rnd);
-    FX_INT32	XFA_ResolveNodes_Normal(CXFA_ResolveNodesData &rnd);
-    FX_INT32	XFA_ResolveNodes_ForAttributeRs(CXFA_Object* curNode, CXFA_ResolveNodesData &rnd, FX_WSTR strAttr);
-    void		XFA_ResolveNode_ConditionArray(FX_INT32 iCurIndex, CFX_WideString wsCondition, FX_INT32 iFoundCount, CXFA_ResolveNodesData &rnd);
-    void		XFA_ResolveNode_DoPredicateFilter(FX_INT32 iCurIndex, CFX_WideString wsCondition, FX_INT32 iFoundCount, CXFA_ResolveNodesData &rnd);
-    FX_INT32	XFA_ResolveNodes_GetFilter(FX_WSTR wsExpression, FX_INT32 nStart, CXFA_ResolveNodesData &rnd);
+    int32_t	XFA_ResolveNodes(CXFA_ResolveNodesData &rnd);
+    int32_t	XFA_ResolveNodes_AnyChild(CXFA_ResolveNodesData &rnd);
+    int32_t	XFA_ResolveNodes_Dollar(CXFA_ResolveNodesData &rnd);
+    int32_t	XFA_ResolveNodes_Excalmatory(CXFA_ResolveNodesData &rnd);
+    int32_t	XFA_ResolveNodes_NumberSign(CXFA_ResolveNodesData &rnd);
+    int32_t	XFA_ResolveNodes_Asterisk(CXFA_ResolveNodesData &rnd);
+    int32_t	XFA_ResolveNodes_Normal(CXFA_ResolveNodesData &rnd);
+    int32_t	XFA_ResolveNodes_ForAttributeRs(CXFA_Object* curNode, CXFA_ResolveNodesData &rnd, FX_WSTR strAttr);
+    void		XFA_ResolveNode_ConditionArray(int32_t iCurIndex, CFX_WideString wsCondition, int32_t iFoundCount, CXFA_ResolveNodesData &rnd);
+    void		XFA_ResolveNode_DoPredicateFilter(int32_t iCurIndex, CFX_WideString wsCondition, int32_t iFoundCount, CXFA_ResolveNodesData &rnd);
+    int32_t	XFA_ResolveNodes_GetFilter(FX_WSTR wsExpression, int32_t nStart, CXFA_ResolveNodesData &rnd);
     void		XFA_ResolveNode_FilterCondition(CXFA_ResolveNodesData &rnd, CFX_WideString wsCondition);
-    FX_INT32	XFA_ResolveNodes_PopStack(CFX_Int32Array &stack);
+    int32_t	XFA_ResolveNodes_PopStack(CFX_Int32Array &stack);
     void		XFA_ResolveNodes_SetStylesForChild(FX_DWORD dwParentStyles, CXFA_ResolveNodesData &rnd);
-    FX_INT32	XFA_ResolveNode_SetResultCreateNode(XFA_RESOLVENODE_RS& resolveNodeRS, CFX_WideString &wsLastCondition);
-    void	    XFA_ResolveNode_SetIndexDataBind(CFX_WideString &wsNextCondition, FX_INT32 &iIndex, FX_INT32 iCount);
+    int32_t	XFA_ResolveNode_SetResultCreateNode(XFA_RESOLVENODE_RS& resolveNodeRS, CFX_WideString &wsLastCondition);
+    void	    XFA_ResolveNode_SetIndexDataBind(CFX_WideString &wsNextCondition, int32_t &iIndex, int32_t iCount);
     CXFA_NodeHelper* GetNodeHelper()
     {
         return m_pNodeHelper;
@@ -67,6 +67,6 @@ public:
 private:
     CXFA_NodeHelper* m_pNodeHelper;
 public:
-    FX_INT32		 m_iCurStart;
+    int32_t		 m_iCurStart;
 };
 #endif