Remove FXJSE_HOBJECT and FXJSE_HVALUE for CFXJSE_Value*

xfa/fxjse/class.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/fxjse/class.h"
 
 #include "xfa/fxjse/cfxjse_arguments.h"
 #include "xfa/fxjse/context.h"
@@ skipping 24 matching lines @@
   const FXJSE_FUNCTION* lpFunctionInfo =
       static_cast<FXJSE_FUNCTION*>(info.Data().As<v8::External>()->Value());
   if (!lpFunctionInfo) {
     return;
   }
   CFX_ByteStringC szFunctionName(lpFunctionInfo->name);
   CFXJSE_Value* lpThisValue = CFXJSE_Value::Create(info.GetIsolate());
   lpThisValue->ForceSetValue(info.This());
   CFXJSE_Value* lpRetValue = CFXJSE_Value::Create(info.GetIsolate());
   CFXJSE_ArgumentsImpl impl = {&info, lpRetValue};
-  lpFunctionInfo->callbackProc(reinterpret_cast<FXJSE_HOBJECT>(lpThisValue),
-                               szFunctionName,
+  lpFunctionInfo->callbackProc(lpThisValue, szFunctionName,
                                reinterpret_cast<CFXJSE_Arguments&>(impl));
   if (!lpRetValue->DirectGetValue().IsEmpty()) {
     info.GetReturnValue().Set(lpRetValue->DirectGetValue());
   }
   delete lpRetValue;
   lpRetValue = NULL;
   delete lpThisValue;
   lpThisValue = NULL;
 }
 
 static void FXJSE_V8ClassGlobalConstructorCallback_Wrapper(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   const FXJSE_CLASS* lpClassDefinition =
       static_cast<FXJSE_CLASS*>(info.Data().As<v8::External>()->Value());
   if (!lpClassDefinition) {
     return;
   }
   CFX_ByteStringC szFunctionName(lpClassDefinition->name);
   CFXJSE_Value* lpThisValue = CFXJSE_Value::Create(info.GetIsolate());
   lpThisValue->ForceSetValue(info.This());
   CFXJSE_Value* lpRetValue = CFXJSE_Value::Create(info.GetIsolate());
   CFXJSE_ArgumentsImpl impl = {&info, lpRetValue};
-  lpClassDefinition->constructor(reinterpret_cast<FXJSE_HOBJECT>(lpThisValue),
-                                 szFunctionName,
+  lpClassDefinition->constructor(lpThisValue, szFunctionName,
                                  reinterpret_cast<CFXJSE_Arguments&>(impl));
   if (!lpRetValue->DirectGetValue().IsEmpty()) {
     info.GetReturnValue().Set(lpRetValue->DirectGetValue());
   }
   delete lpRetValue;
   lpRetValue = NULL;
   delete lpThisValue;
   lpThisValue = NULL;
 }
 
 static void FXJSE_V8GetterCallback_Wrapper(
     v8::Local<v8::String> property,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   const FXJSE_PROPERTY* lpPropertyInfo =
       static_cast<FXJSE_PROPERTY*>(info.Data().As<v8::External>()->Value());
   if (!lpPropertyInfo) {
     return;
   }
   CFX_ByteStringC szPropertyName(lpPropertyInfo->name);
   CFXJSE_Value* lpThisValue = CFXJSE_Value::Create(info.GetIsolate());
   CFXJSE_Value* lpPropValue = CFXJSE_Value::Create(info.GetIsolate());
   lpThisValue->ForceSetValue(info.This());
-  lpPropertyInfo->getProc(reinterpret_cast<FXJSE_HOBJECT>(lpThisValue),
-                          szPropertyName,
-                          reinterpret_cast<FXJSE_HVALUE>(lpPropValue));
+  lpPropertyInfo->getProc(lpThisValue, szPropertyName, lpPropValue);
   info.GetReturnValue().Set(lpPropValue->DirectGetValue());
   delete lpThisValue;
   lpThisValue = NULL;
   delete lpPropValue;
   lpPropValue = NULL;
 }
 
 static void FXJSE_V8SetterCallback_Wrapper(
     v8::Local<v8::String> property,
     v8::Local<v8::Value> value,
     const v8::PropertyCallbackInfo<void>& info) {
   const FXJSE_PROPERTY* lpPropertyInfo =
       static_cast<FXJSE_PROPERTY*>(info.Data().As<v8::External>()->Value());
   if (!lpPropertyInfo) {
     return;
   }
   CFX_ByteStringC szPropertyName(lpPropertyInfo->name);
   CFXJSE_Value* lpThisValue = CFXJSE_Value::Create(info.GetIsolate());
   CFXJSE_Value* lpPropValue = CFXJSE_Value::Create(info.GetIsolate());
   lpThisValue->ForceSetValue(info.This());
   lpPropValue->ForceSetValue(value);
-  lpPropertyInfo->setProc(reinterpret_cast<FXJSE_HOBJECT>(lpThisValue),
-                          szPropertyName,
-                          reinterpret_cast<FXJSE_HVALUE>(lpPropValue));
+  lpPropertyInfo->setProc(lpThisValue, szPropertyName, lpPropValue);
   delete lpThisValue;
   lpThisValue = NULL;
   delete lpPropValue;
   lpPropValue = NULL;
 }
 
 static void FXJSE_V8ConstructorCallback_Wrapper(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   const FXJSE_CLASS* lpClassDefinition =
       static_cast<FXJSE_CLASS*>(info.Data().As<v8::External>()->Value());
   if (!lpClassDefinition) {
     return;
   }
   ASSERT(info.This()->InternalFieldCount());
   info.This()->SetAlignedPointerInInternalField(0, NULL);
 }
 
 v8::Isolate* CFXJSE_Arguments::GetRuntime() const {
   const CFXJSE_ArgumentsImpl* lpArguments =
       reinterpret_cast<const CFXJSE_ArgumentsImpl* const>(this);
   return lpArguments->m_pRetValue->GetIsolate();
 }
 
 int32_t CFXJSE_Arguments::GetLength() const {
   const CFXJSE_ArgumentsImpl* lpArguments =
       reinterpret_cast<const CFXJSE_ArgumentsImpl* const>(this);
   return lpArguments->m_pInfo->Length();
 }
 
-FXJSE_HVALUE CFXJSE_Arguments::GetValue(int32_t index) const {
+CFXJSE_Value* CFXJSE_Arguments::GetValue(int32_t index) const {
   const CFXJSE_ArgumentsImpl* lpArguments =
       reinterpret_cast<const CFXJSE_ArgumentsImpl* const>(this);
   CFXJSE_Value* lpArgValue = CFXJSE_Value::Create(v8::Isolate::GetCurrent());
   ASSERT(lpArgValue);
   lpArgValue->ForceSetValue((*lpArguments->m_pInfo)[index]);
-  return reinterpret_cast<FXJSE_HVALUE>(lpArgValue);
+  return lpArgValue;
 }
 
 FX_BOOL CFXJSE_Arguments::GetBoolean(int32_t index) const {
   const CFXJSE_ArgumentsImpl* lpArguments =
       reinterpret_cast<const CFXJSE_ArgumentsImpl* const>(this);
   return (*lpArguments->m_pInfo)[index]->BooleanValue();
 }
 
 int32_t CFXJSE_Arguments::GetInt32(int32_t index) const {
   const CFXJSE_ArgumentsImpl* lpArguments =
@@ skipping 19 matching lines @@
   const CFXJSE_ArgumentsImpl* lpArguments =
       reinterpret_cast<const CFXJSE_ArgumentsImpl* const>(this);
   v8::Local<v8::Value> hValue = (*lpArguments->m_pInfo)[index];
   ASSERT(!hValue.IsEmpty());
   if (!hValue->IsObject()) {
     return NULL;
   }
   return FXJSE_RetrieveObjectBinding(hValue.As<v8::Object>(), pClass);
 }
 
-FXJSE_HVALUE CFXJSE_Arguments::GetReturnValue() {
+CFXJSE_Value* CFXJSE_Arguments::GetReturnValue() {
   const CFXJSE_ArgumentsImpl* lpArguments =
       reinterpret_cast<const CFXJSE_ArgumentsImpl* const>(this);
-  return reinterpret_cast<FXJSE_HVALUE>(lpArguments->m_pRetValue);
+  return lpArguments->m_pRetValue;
 }
 static void FXJSE_Context_GlobalObjToString(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   const FXJSE_CLASS* lpClass =
       static_cast<FXJSE_CLASS*>(info.Data().As<v8::External>()->Value());
   if (!lpClass) {
     return;
   }
   if (info.This() == info.Holder() && lpClass->name) {
     CFX_ByteString szStringVal;
@@ skipping 97 matching lines @@
 }
 
 CFXJSE_Class* CFXJSE_Class::GetClassFromContext(CFXJSE_Context* pContext,
                                                 const CFX_ByteStringC& szName) {
   for (const auto& pClass : pContext->m_rgClasses) {
     if (pClass->m_szClassName == szName)
       return pClass.get();
   }
   return nullptr;
 }