diff options
| author | tsepez <tsepez@chromium.org> | 2016-05-31 14:22:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-31 14:22:09 -0700 |
| commit | 29adee77d4a7566bc6832cc825198c0571426163 (patch) | |
| tree | e8fd009fe853b4d8aad499d6e92cfff8f7dd6efa /xfa/fxfa/app | |
| parent | fb96900eeea15b252245b0caf4330a5ade369172 (diff) | |
| download | pdfium-29adee77d4a7566bc6832cc825198c0571426163.tar.xz | |
Replace void* with CFXJSE_HostObect and make wrapped objects inherit from it
This will avoid a re-occurrence of BUG 613607 should someone
again optimize away CXFA_Object's virtual dtor.
Review-Url: https://codereview.chromium.org/2019333006
Diffstat (limited to 'xfa/fxfa/app')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffdochandler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fxfa/app/xfa_ffdochandler.cpp b/xfa/fxfa/app/xfa_ffdochandler.cpp index 53ce9c0e26..e65dd914d1 100644 --- a/xfa/fxfa/app/xfa_ffdochandler.cpp +++ b/xfa/fxfa/app/xfa_ffdochandler.cpp @@ -45,7 +45,7 @@ FX_BOOL CXFA_FFDocHandler::RunDocScript(CXFA_FFDoc* hDoc, XFA_SCRIPTTYPE eScriptType, const CFX_WideStringC& wsScript, CFXJSE_Value* pRetValue, - CFXJSE_Value* pThisObject) { + CFXJSE_Value* pThisValue) { CXFA_Document* pXFADoc = hDoc->GetXFADoc(); if (!pXFADoc) return FALSE; @@ -56,6 +56,7 @@ FX_BOOL CXFA_FFDocHandler::RunDocScript(CXFA_FFDoc* hDoc, return pScriptContext->RunScript( (XFA_SCRIPTLANGTYPE)eScriptType, wsScript, pRetValue, - pThisObject ? (CXFA_Object*)FXJSE_Value_ToObject(pThisObject, nullptr) - : nullptr); + pThisValue + ? static_cast<CXFA_Object*>(FXJSE_Value_ToObject(pThisValue, nullptr)) + : nullptr); } |