Revert of Remove parameters which are always null

xfa/fxfa/parser/xfa_script_imp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fxfa/parser/xfa_script_imp.h"
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
@@ skipping 83 matching lines @@
   FXJSE_HVALUE pValue = pThisObject ? GetJSValueFromMap(pThisObject) : NULL;
   FX_BOOL bRet =
       FXJSE_ExecuteScript(m_hJsContext, btScript.c_str(), hRetValue, pValue);
   m_pThisObject = pOriginalObject;
   m_eScriptType = eSaveType;
   return bRet;
 }
 void CXFA_ScriptContext::GlobalPropertySetter(FXJSE_HOBJECT hObject,
                                               const CFX_ByteStringC& szPropName,
                                               FXJSE_HVALUE hValue) {
-  CXFA_Object* lpOrginalNode = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
+  CXFA_Object* lpOrginalNode =
+      (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
   CXFA_Document* pDoc = lpOrginalNode->GetDocument();
   CXFA_ScriptContext* lpScriptContext =
       (CXFA_ScriptContext*)pDoc->GetScriptContext();
   CXFA_Object* lpCurNode = lpScriptContext->GetVariablesThis(lpOrginalNode);
   CFX_WideString wsPropName = CFX_WideString::FromUTF8(szPropName);
   uint32_t dwFlag = XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings |
                     XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
                     XFA_RESOLVENODE_Attributes;
   CXFA_Node* pRefNode = ToNode(lpScriptContext->GetThisObject());
   if (lpOrginalNode->GetObjectType() == XFA_OBJECTTYPE_VariablesThis) {
@@ skipping 36 matching lines @@
     if (lpAttributeInfo) {
       (resolveRs.nodes[0]->*(lpAttributeInfo->lpfnCallback))(
           hValue, bSetting, (XFA_ATTRIBUTE)lpAttributeInfo->eAttribute);
     }
   }
   return true;
 }
 void CXFA_ScriptContext::GlobalPropertyGetter(FXJSE_HOBJECT hObject,
                                               const CFX_ByteStringC& szPropName,
                                               FXJSE_HVALUE hValue) {
-  CXFA_Object* pOrginalObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
+  CXFA_Object* pOrginalObject =
+      (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
   CXFA_Document* pDoc = pOrginalObject->GetDocument();
   CXFA_ScriptContext* lpScriptContext =
       (CXFA_ScriptContext*)pDoc->GetScriptContext();
   CXFA_Object* lpCurNode = lpScriptContext->GetVariablesThis(pOrginalObject);
   CFX_WideString wsPropName = CFX_WideString::FromUTF8(szPropName);
   if (lpScriptContext->GetType() == XFA_SCRIPTLANGTYPE_Formcalc) {
     if (szPropName == FOXIT_XFA_FM2JS_FORMCALC_RUNTIME) {
       XFA_FM2JS_GlobalPropertyGetter(lpScriptContext->m_hFM2JSContext, hValue);
       return;
     }
@@ skipping 33 matching lines @@
   CXFA_FFNotify* pNotify = pDoc->GetNotify();
   if (!pNotify) {
     return;
   }
   pNotify->GetDocProvider()->GetGlobalProperty(pNotify->GetHDOC(), szPropName,
                                                hValue);
 }
 void CXFA_ScriptContext::NormalPropertyGetter(FXJSE_HOBJECT hObject,
                                               const CFX_ByteStringC& szPropName,
                                               FXJSE_HVALUE hValue) {
-  CXFA_Object* pOrginalObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
+  CXFA_Object* pOrginalObject =
+      (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
   if (pOrginalObject == NULL) {
     FXJSE_Value_SetUndefined(hValue);
     return;
   }
   CFX_WideString wsPropName = CFX_WideString::FromUTF8(szPropName);
   CXFA_ScriptContext* lpScriptContext =
       (CXFA_ScriptContext*)pOrginalObject->GetDocument()->GetScriptContext();
   CXFA_Object* pObject = lpScriptContext->GetVariablesThis(pOrginalObject);
   if (wsPropName == FX_WSTRC(L"xfa")) {
     FXJSE_HVALUE pValue = lpScriptContext->GetJSValueFromMap(
@@ skipping 24 matching lines @@
     bRet = lpScriptContext->QueryVariableHValue(ToNode(pScriptObject),
                                                 szPropName, hValue, TRUE);
   }
   if (!bRet) {
     FXJSE_Value_SetUndefined(hValue);
   }
 }
 void CXFA_ScriptContext::NormalPropertySetter(FXJSE_HOBJECT hObject,
                                               const CFX_ByteStringC& szPropName,
                                               FXJSE_HVALUE hValue) {
-  CXFA_Object* pOrginalObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
+  CXFA_Object* pOrginalObject =
+      (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
   if (pOrginalObject == NULL) {
     return;
   }
   CXFA_ScriptContext* lpScriptContext =
       (CXFA_ScriptContext*)pOrginalObject->GetDocument()->GetScriptContext();
   CXFA_Object* pObject = lpScriptContext->GetVariablesThis(pOrginalObject);
   CFX_WideString wsPropName = CFX_WideString::FromUTF8(szPropName);
   const XFA_SCRIPTATTRIBUTEINFO* lpAttributeInfo = XFA_GetScriptAttributeByName(
       pObject->GetClassID(), wsPropName.AsStringC());
   if (lpAttributeInfo) {
@@ skipping 30 matching lines @@
     if (pScriptObject) {
       lpScriptContext->QueryVariableHValue(ToNode(pScriptObject), szPropName,
                                            hValue, FALSE);
     }
   }
 }
 int32_t CXFA_ScriptContext::NormalPropTypeGetter(
     FXJSE_HOBJECT hObject,
     const CFX_ByteStringC& szPropName,
     FX_BOOL bQueryIn) {
-  CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
+  CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
   if (pObject == NULL) {
     return FXJSE_ClassPropType_None;
   }
   CXFA_ScriptContext* lpScriptContext =
       (CXFA_ScriptContext*)pObject->GetDocument()->GetScriptContext();
   pObject = lpScriptContext->GetVariablesThis(pObject);
   XFA_ELEMENT objElement = pObject->GetClassID();
   CFX_WideString wsPropName = CFX_WideString::FromUTF8(szPropName);
   if (XFA_GetMethodByName(objElement, wsPropName.AsStringC())) {
     return FXJSE_ClassPropType_Method;
   }
   if (bQueryIn &&
       !XFA_GetScriptAttributeByName(objElement, wsPropName.AsStringC())) {
     return FXJSE_ClassPropType_None;
   }
   return FXJSE_ClassPropType_Property;
 }
 int32_t CXFA_ScriptContext::GlobalPropTypeGetter(
     FXJSE_HOBJECT hObject,
     const CFX_ByteStringC& szPropName,
     FX_BOOL bQueryIn) {
-  CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject);
+  CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hObject, NULL);
   if (pObject == NULL) {
     return FXJSE_ClassPropType_None;
   }
   CXFA_ScriptContext* lpScriptContext =
       (CXFA_ScriptContext*)pObject->GetDocument()->GetScriptContext();
   pObject = lpScriptContext->GetVariablesThis(pObject);
   XFA_ELEMENT objElement = pObject->GetClassID();
   CFX_WideString wsPropName = CFX_WideString::FromUTF8(szPropName);
   if (XFA_GetMethodByName(objElement, wsPropName.AsStringC())) {
     return FXJSE_ClassPropType_Method;
   }
   return FXJSE_ClassPropType_Property;
 }
 void CXFA_ScriptContext::NormalMethodCall(FXJSE_HOBJECT hThis,
                                           const CFX_ByteStringC& szFuncName,
                                           CFXJSE_Arguments& args) {
-  CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hThis);
+  CXFA_Object* pObject = (CXFA_Object*)FXJSE_Value_ToObject(hThis, NULL);
   if (pObject == NULL) {
     return;
   }
   CXFA_ScriptContext* lpScriptContext =
       (CXFA_ScriptContext*)pObject->GetDocument()->GetScriptContext();
   pObject = lpScriptContext->GetVariablesThis(pObject);
   CFX_WideString wsFunName = CFX_WideString::FromUTF8(szFuncName);
   const XFA_METHODINFO* lpMethodInfo =
       XFA_GetMethodByName(pObject->GetClassID(), wsFunName.AsStringC());
   if (NULL == lpMethodInfo) {
@@ skipping 141 matching lines @@
   return bRes;
 }
 
 void CXFA_ScriptContext::ReleaseVariablesMap() {
   FX_POSITION ps = m_mapVariableToHValue.GetStartPosition();
   while (ps) {
     CXFA_Object* pScriptNode;
     FXJSE_HCONTEXT hVariableContext = nullptr;
     m_mapVariableToHValue.GetNextAssoc(ps, pScriptNode, hVariableContext);
     FXJSE_HVALUE hObject = FXJSE_Context_GetGlobalObject(hVariableContext);
-    delete static_cast<CXFA_ThisProxy*>(FXJSE_Value_ToObject(hObject));
+    delete static_cast<CXFA_ThisProxy*>(FXJSE_Value_ToObject(hObject, nullptr));
     FXJSE_Value_Release(hObject);
     FXJSE_Context_Release(hVariableContext);
   }
   m_mapVariableToHValue.RemoveAll();
 }
 
 void CXFA_ScriptContext::DefineJsClass() {
   m_JsNormalClass.constructor = NULL;
   m_JsNormalClass.name = "XFAObject";
   m_JsNormalClass.propNum = 0;
@@ skipping 113 matching lines @@
       nRet = m_pResolveProcessor->XFA_ResolveNodes(rndFind);
       if (nRet < 1) {
         continue;
       }
       if (rndFind.m_dwFlag == XFA_RESOVENODE_RSTYPE_Attribute &&
           rndFind.m_pScriptAttribute && nStart < wsExpression.GetLength()) {
         FXJSE_HVALUE hValue = FXJSE_Value_Create(m_pIsolate);
         (rndFind.m_Nodes[0]->*(rndFind.m_pScriptAttribute->lpfnCallback))(
             hValue, FALSE,
             (XFA_ATTRIBUTE)rndFind.m_pScriptAttribute->eAttribute);
-        rndFind.m_Nodes.SetAt(0, (CXFA_Object*)FXJSE_Value_ToObject(hValue));
+        rndFind.m_Nodes.SetAt(0,
+                              (CXFA_Object*)FXJSE_Value_ToObject(hValue, NULL));
         FXJSE_Value_Release(hValue);
       }
       int32_t iSize = m_upObjectArray.GetSize();
       if (iSize) {
         m_upObjectArray.RemoveAt(iSize - 1);
       }
       retNodes.Append(rndFind.m_Nodes);
       rndFind.m_Nodes.RemoveAll();
       if (bDataBind) {
         break;
@@ skipping 96 matching lines @@
   }
 }
 void CXFA_ScriptContext::AddNodesOfRunScript(CXFA_Node* pNode) {
   if (!m_pScriptNodeArray) {
     return;
   }
   if (m_pScriptNodeArray->Find(pNode) == -1) {
     m_pScriptNodeArray->Add(pNode);
   }
 }