Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Unified Diff: xfa/fxfa/app/xfa_ffdochandler.cpp

Issue 2019333006: Replace void* with CFXJSE_HostObect and make wrapped objects inherit from it (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Another blown merge Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | xfa/fxfa/fm2js/xfa_fm2jscontext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/app/xfa_ffdochandler.cpp
diff --git a/xfa/fxfa/app/xfa_ffdochandler.cpp b/xfa/fxfa/app/xfa_ffdochandler.cpp
index 53ce9c0e262ae9bb696fe6dd3ea16efa5e4e688e..e65dd914d167326c0405757f90f2112ddee5be4a 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);
}
« no previous file with comments | « no previous file | xfa/fxfa/fm2js/xfa_fm2jscontext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698