Remove FXJSE_HOBJECT and FXJSE_HVALUE for CFXJSE_Value*

fpdfsdk/javascript/cjs_runtime.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 "fpdfsdk/javascript/cjs_runtime.h"
 
 #include <algorithm>
 
@@ skipping 242 matching lines @@
 v8::Local<v8::Array> CJS_Runtime::GetConstArray(const CFX_WideString& name) {
   return v8::Local<v8::Array>::New(m_isolate, m_ConstArrays[name]);
 }
 
 #ifdef PDF_ENABLE_XFA
 CFX_WideString ChangeObjName(const CFX_WideString& str) {
   CFX_WideString sRet = str;
   sRet.Replace(L"_", L".");
   return sRet;
 }
-FX_BOOL CJS_Runtime::GetHValueByName(const CFX_ByteStringC& utf8Name,
-                                     FXJSE_HVALUE hValue) {
+FX_BOOL CJS_Runtime::GetValueByName(const CFX_ByteStringC& utf8Name,
+                                    CFXJSE_Value* pValue) {
 #ifdef PDF_ENABLE_XFA
   const FX_CHAR* name = utf8Name.c_str();
 
   v8::Locker lock(GetIsolate());
   v8::Isolate::Scope isolate_scope(GetIsolate());
   v8::HandleScope handle_scope(GetIsolate());
   v8::Local<v8::Context> old_context = GetIsolate()->GetCurrentContext();
   v8::Local<v8::Context> context =
       v8::Local<v8::Context>::New(GetIsolate(), m_context);
   v8::Context::Scope context_scope(context);
 
   // Caution: We're about to hand to XFA an object that in order to invoke
   // methods will require that the current v8::Context always has a pointer
   // to a CJS_Runtime in its embedder data slot. Unfortunately, XFA creates
   // its own v8::Context which has not initialized the embedder data slot.
   // Do so now.
   // TODO(tsepez): redesign PDF-side objects to not rely on v8::Context's
   // embedder data slots, and/or to always use the right context.
   FXJS_SetRuntimeForV8Context(old_context, this);
 
   v8::Local<v8::Value> propvalue =
       context->Global()->Get(v8::String::NewFromUtf8(
           GetIsolate(), name, v8::String::kNormalString, utf8Name.GetLength()));
 
   if (propvalue.IsEmpty()) {
-    FXJSE_Value_SetUndefined(hValue);
+    FXJSE_Value_SetUndefined(pValue);
     return FALSE;
   }
-  ((CFXJSE_Value*)hValue)->ForceSetValue(propvalue);
+  pValue->ForceSetValue(propvalue);
 #endif
 
   return TRUE;
 }
-FX_BOOL CJS_Runtime::SetHValueByName(const CFX_ByteStringC& utf8Name,
-                                     FXJSE_HVALUE hValue) {
+FX_BOOL CJS_Runtime::SetValueByName(const CFX_ByteStringC& utf8Name,
+                                    CFXJSE_Value* pValue) {
 #ifdef PDF_ENABLE_XFA
-  if (utf8Name.IsEmpty() || hValue == NULL)
+  if (utf8Name.IsEmpty() || !pValue)
     return FALSE;
   const FX_CHAR* name = utf8Name.c_str();
   v8::Isolate* pIsolate = GetIsolate();
   v8::Locker lock(pIsolate);
   v8::Isolate::Scope isolate_scope(pIsolate);
   v8::HandleScope handle_scope(pIsolate);
   v8::Local<v8::Context> context =
       v8::Local<v8::Context>::New(pIsolate, m_context);
   v8::Context::Scope context_scope(context);
 
   // v8::Local<v8::Context> tmpCotext =
   // v8::Local<v8::Context>::New(GetIsolate(), m_context);
-  v8::Local<v8::Value> propvalue = v8::Local<v8::Value>::New(
-      GetIsolate(), ((CFXJSE_Value*)hValue)->DirectGetValue());
+  v8::Local<v8::Value> propvalue =
+      v8::Local<v8::Value>::New(GetIsolate(), pValue->DirectGetValue());
   context->Global()->Set(
       v8::String::NewFromUtf8(pIsolate, name, v8::String::kNormalString,
                               utf8Name.GetLength()),
       propvalue);
 #endif
   return TRUE;
 }
 
 #endif
 void CJS_Runtime::AddObserver(Observer* observer) {
   ASSERT(!pdfium::ContainsKey(m_observers, observer));
   m_observers.insert(observer);
 }
 
 void CJS_Runtime::RemoveObserver(Observer* observer) {
   ASSERT(pdfium::ContainsKey(m_observers, observer));
   m_observers.erase(observer);
 }