From 29adee77d4a7566bc6832cc825198c0571426163 Mon Sep 17 00:00:00 2001 From: tsepez Date: Tue, 31 May 2016 14:22:09 -0700 Subject: 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 --- xfa/fxfa/app/xfa_ffdochandler.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/app') 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(FXJSE_Value_ToObject(pThisValue, nullptr)) + : nullptr); } -- cgit v1.2.3