diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-05-26 11:14:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-26 11:14:08 -0700 |
| commit | 12a6b0c1bb3ab86a03a84464bed168995ae0d82a (patch) | |
| tree | 03c381e1eb6afd47f14c76cc3f9b91641a603dff /xfa/fxfa/include | |
| parent | d3e354a43531eaed87e43d9ff2df4525186ea28d (diff) | |
| download | pdfium-12a6b0c1bb3ab86a03a84464bed168995ae0d82a.tar.xz | |
Remove FXJSE_HOBJECT and FXJSE_HVALUE for CFXJSE_Value*
This CL replaces FXJSE_HOBJECT and FXJSE_HVALUE with the concrete CFXJSE_Value*
type. All variables are renamed to match.
Review-Url: https://codereview.chromium.org/2012253002
Diffstat (limited to 'xfa/fxfa/include')
| -rw-r--r-- | xfa/fxfa/include/fxfa.h | 6 | ||||
| -rw-r--r-- | xfa/fxfa/include/fxfa_basic.h | 2 | ||||
| -rw-r--r-- | xfa/fxfa/include/fxfa_widget.h | 4 | ||||
| -rw-r--r-- | xfa/fxfa/include/xfa_ffdochandler.h | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/include/fxfa.h b/xfa/fxfa/include/fxfa.h index f7f4a04166..a33263364d 100644 --- a/xfa/fxfa/include/fxfa.h +++ b/xfa/fxfa/include/fxfa.h @@ -470,13 +470,13 @@ class IXFA_DocProvider { std::vector<CFX_ByteString>& sSuggest) = 0; virtual FX_BOOL GetPDFScriptObject(CXFA_FFDoc* hDoc, const CFX_ByteStringC& utf8Name, - FXJSE_HVALUE hValue) = 0; + CFXJSE_Value* pValue) = 0; virtual FX_BOOL GetGlobalProperty(CXFA_FFDoc* hDoc, const CFX_ByteStringC& szPropName, - FXJSE_HVALUE hValue) = 0; + CFXJSE_Value* pValue) = 0; virtual FX_BOOL SetGlobalProperty(CXFA_FFDoc* hDoc, const CFX_ByteStringC& szPropName, - FXJSE_HVALUE hValue) = 0; + CFXJSE_Value* pValue) = 0; virtual CPDF_Document* OpenPDF(CXFA_FFDoc* hDoc, IFX_FileRead* pFile, FX_BOOL bTakeOverFile) = 0; diff --git a/xfa/fxfa/include/fxfa_basic.h b/xfa/fxfa/include/fxfa_basic.h index f5f52c7a7f..e1aa67447e 100644 --- a/xfa/fxfa/include/fxfa_basic.h +++ b/xfa/fxfa/include/fxfa_basic.h @@ -1063,7 +1063,7 @@ struct XFA_METHODINFO { const XFA_METHODINFO* XFA_GetMethodByName(XFA_ELEMENT eElement, const CFX_WideStringC& wsMethodName); -typedef void (CXFA_Object::*XFA_ATTRIBUTE_CALLBACK)(FXJSE_HVALUE hValue, +typedef void (CXFA_Object::*XFA_ATTRIBUTE_CALLBACK)(CFXJSE_Value* pValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute); enum XFA_SCRIPT_TYPE { diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h index 53409433dc..e07005cc74 100644 --- a/xfa/fxfa/include/fxfa_widget.h +++ b/xfa/fxfa/include/fxfa_widget.h @@ -53,7 +53,7 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { int32_t ProcessValidate(int32_t iFlags = 0); int32_t ExecuteScript(CXFA_Script script, CXFA_EventParam* pEventParam, - FXJSE_HVALUE* pRetValue = NULL); + CFXJSE_Value** pRetValue = nullptr); CXFA_FFWidget* GetNextWidget(CXFA_FFWidget* pWidget); void StartWidgetLayout(FX_FLOAT& fCalcWidth, FX_FLOAT& fCalcHeight); @@ -82,7 +82,7 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { protected: void ProcessScriptTestValidate(CXFA_Validate validate, int32_t iRet, - FXJSE_HVALUE pRetValue, + CFXJSE_Value* pRetValue, FX_BOOL bVersionFlag); int32_t ProcessFormatTestValidate(CXFA_Validate validate, FX_BOOL bVersionFlag); diff --git a/xfa/fxfa/include/xfa_ffdochandler.h b/xfa/fxfa/include/xfa_ffdochandler.h index 9cd9b0e632..b5a73d1d10 100644 --- a/xfa/fxfa/include/xfa_ffdochandler.h +++ b/xfa/fxfa/include/xfa_ffdochandler.h @@ -16,14 +16,14 @@ class CXFA_FFDocHandler { CXFA_FFDocHandler(); ~CXFA_FFDocHandler(); - FXJSE_HVALUE GetXFAScriptObject(CXFA_FFDoc* hDoc); + CFXJSE_Value* GetXFAScriptObject(CXFA_FFDoc* hDoc); XFA_ATTRIBUTEENUM GetRestoreState(CXFA_FFDoc* hDoc); FX_BOOL RunDocScript(CXFA_FFDoc* hDoc, XFA_SCRIPTTYPE eScriptType, const CFX_WideStringC& wsScript, - FXJSE_HVALUE hRetValue, - FXJSE_HVALUE hThisObject); + CFXJSE_Value* pRetValue, + CFXJSE_Value* pThisObject); protected: }; |