Remove FXJSE_HOBJECT and FXJSE_HVALUE for CFXJSE_Value*

xfa/fxfa/app/xfa_ffwidgetacc.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/app/xfa_ffwidgetacc.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 348 matching lines @@
 
   if (GetRawValue() != EventParam.m_wsResult) {
     SetValue(EventParam.m_wsResult, XFA_VALUEPICTURE_Raw);
     UpdateUIDisplay();
   }
   return XFA_EVENTERROR_Success;
 }
 
 void CXFA_WidgetAcc::ProcessScriptTestValidate(CXFA_Validate validate,
                                                int32_t iRet,
-                                               FXJSE_HVALUE pRetValue,
+                                               CFXJSE_Value* pRetValue,
                                                FX_BOOL bVersionFlag) {
   if (iRet == XFA_EVENTERROR_Success && pRetValue) {
     if (FXJSE_Value_IsBoolean(pRetValue) && !FXJSE_Value_ToBoolean(pRetValue)) {
       IXFA_AppProvider* pAppProvider = GetAppProvider();
       if (!pAppProvider) {
         return;
       }
       CFX_WideString wsTitle;
       pAppProvider->LoadString(XFA_IDS_AppName, wsTitle);
       CFX_WideString wsScriptMsg;
@@ skipping 193 matching lines @@
     return XFA_EVENTERROR_NotExist;
   }
   CXFA_Validate validate = GetValidate();
   if (!validate) {
     return XFA_EVENTERROR_NotExist;
   }
   FX_BOOL bInitDoc = validate.GetNode()->HasFlag(XFA_NODEFLAG_NeedsInitApp);
   FX_BOOL bStatus =
       m_pDocView->GetLayoutStatus() < XFA_DOCVIEW_LAYOUTSTATUS_End;
   int32_t iFormat = 0;
-  FXJSE_HVALUE pRetValue = NULL;
+  CFXJSE_Value* pRetValue = nullptr;
   int32_t iRet = XFA_EVENTERROR_NotExist;
   CXFA_Script script = validate.GetScript();
   if (script) {
     CXFA_EventParam eParam;
     eParam.m_eType = XFA_EVENT_Validate;
     eParam.m_pTarget = this;
     iRet = ExecuteScript(script, &eParam,
                          ((bInitDoc || bStatus) && GetRawValue().IsEmpty())
                              ? nullptr
                              : &pRetValue);
@@ skipping 15 matching lines @@
   if (iFormat != XFA_EVENTERROR_Success) {
     ProcessScriptTestValidate(validate, iRet, pRetValue, bVersionFlag);
   }
   if (pRetValue) {
     FXJSE_Value_Release(pRetValue);
   }
   return iRet | iFormat;
 }
 int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script,
                                       CXFA_EventParam* pEventParam,
-                                      FXJSE_HVALUE* pRetValue) {
+                                      CFXJSE_Value** pRetValue) {
   static const uint32_t MAX_RECURSION_DEPTH = 2;
   if (m_nRecursionDepth > MAX_RECURSION_DEPTH)
     return XFA_EVENTERROR_Success;
   ASSERT(pEventParam);
   if (!script) {
     return XFA_EVENTERROR_NotExist;
   }
   if (script.GetRunAt() == XFA_ATTRIBUTEENUM_Server) {
     return XFA_EVENTERROR_Disabled;
   }
   CFX_WideString wsExpression;
   script.GetExpression(wsExpression);
   if (wsExpression.IsEmpty()) {
     return XFA_EVENTERROR_NotExist;
   }
   XFA_SCRIPTTYPE eScriptType = script.GetContentType();
   if (eScriptType == XFA_SCRIPTTYPE_Unkown) {
     return XFA_EVENTERROR_Success;
   }
   CXFA_FFDoc* pDoc = GetDoc();
   CXFA_ScriptContext* pContext = pDoc->GetXFADoc()->GetScriptContext();
   pContext->SetEventParam(*pEventParam);
   pContext->SetRunAtType((XFA_ATTRIBUTEENUM)script.GetRunAt());
   CXFA_NodeArray refNodes;
   if (pEventParam->m_eType == XFA_EVENT_InitCalculate ||
       pEventParam->m_eType == XFA_EVENT_Calculate) {
     pContext->SetNodesOfRunScript(&refNodes);
   }
-  FXJSE_HVALUE hRetValue = FXJSE_Value_Create(pContext->GetRuntime());
+  CFXJSE_Value* pTmpRetValue = FXJSE_Value_Create(pContext->GetRuntime());
   ++m_nRecursionDepth;
   FX_BOOL bRet =
       pContext->RunScript((XFA_SCRIPTLANGTYPE)eScriptType,
-                          wsExpression.AsStringC(), hRetValue, m_pNode);
+                          wsExpression.AsStringC(), pTmpRetValue, m_pNode);
   --m_nRecursionDepth;
   int32_t iRet = XFA_EVENTERROR_Error;
   if (bRet) {
     iRet = XFA_EVENTERROR_Success;
     if (pEventParam->m_eType == XFA_EVENT_Calculate ||
         pEventParam->m_eType == XFA_EVENT_InitCalculate) {
-      if (!FXJSE_Value_IsUndefined(hRetValue)) {
-        if (!FXJSE_Value_IsNull(hRetValue)) {
+      if (!FXJSE_Value_IsUndefined(pTmpRetValue)) {
+        if (!FXJSE_Value_IsNull(pTmpRetValue)) {
           CFX_ByteString bsString;
-          FXJSE_Value_ToUTF8String(hRetValue, bsString);
+          FXJSE_Value_ToUTF8String(pTmpRetValue, bsString);
           pEventParam->m_wsResult =
               CFX_WideString::FromUTF8(bsString.AsStringC());
         }
         iRet = XFA_EVENTERROR_Success;
       } else {
         iRet = XFA_EVENTERROR_Error;
       }
       if (pEventParam->m_eType == XFA_EVENT_InitCalculate) {
         if ((iRet == XFA_EVENTERROR_Success) &&
             (GetRawValue() != pEventParam->m_wsResult)) {
@@ skipping 15 matching lines @@
           pRefNode->SetUserData(XFA_CalcData, pGlobalData,
                                 &gs_XFADeleteCalcData);
         }
         if (pGlobalData->m_Globals.Find(this) < 0) {
           pGlobalData->m_Globals.Add(this);
         }
       }
     }
   }
   if (pRetValue) {
-    *pRetValue = hRetValue;
+    *pRetValue = pTmpRetValue;
   } else {
-    FXJSE_Value_Release(hRetValue);
+    FXJSE_Value_Release(pTmpRetValue);
   }
   pContext->SetNodesOfRunScript(NULL);
   return iRet;
 }
 CXFA_FFWidget* CXFA_WidgetAcc::GetNextWidget(CXFA_FFWidget* pWidget) {
   CXFA_LayoutItem* pLayout = nullptr;
   if (pWidget) {
     pLayout = pWidget->GetNext();
   } else {
     pLayout = m_pDocView->GetXFALayout()->GetLayoutItem(m_pNode);
@@ skipping 980 matching lines @@
     if (pIDNode) {
       pEmbAcc = (CXFA_WidgetAcc*)pIDNode->GetWidgetData();
     }
     if (pEmbAcc) {
       pEmbAcc->GetValue(wsValue, XFA_VALUEPICTURE_Display);
       return TRUE;
     }
   }
   return FALSE;
 }