Remove FXJSE_Value_ToObject and call methods directly

xfa/fxfa/parser/xfa_script.h

 // 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
 
 #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_H_
 #define XFA_FXFA_PARSER_XFA_SCRIPT_H_
 
 #include "xfa/fxfa/include/fxfa.h"
@@ skipping 20 matching lines @@
   XFA_RESOVENODE_RSTYPE_Nodes,
   XFA_RESOVENODE_RSTYPE_Attribute,
   XFA_RESOLVENODE_RSTYPE_CreateNodeOne,
   XFA_RESOLVENODE_RSTYPE_CreateNodeAll,
   XFA_RESOLVENODE_RSTYPE_CreateNodeMidAll,
   XFA_RESOVENODE_RSTYPE_ExistNodes,
 };
 
 class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> {
  public:
   CXFA_ValueArray(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}

[Tom Sepez, 2016/06/02 18:20:23]

nit: explicit

[dsinclair, 2016/06/02 18:58:05]

Done.

 
   ~CXFA_ValueArray() {
-    for (int32_t i = 0; i < GetSize(); i++) {
+    for (int32_t i = 0; i < GetSize(); i++)
       delete GetAt(i);
-    }
   }
 
   void GetAttributeObject(CXFA_ObjArray& objArray) {
-    for (int32_t i = 0; i < GetSize(); i++) {
-      objArray.Add(
-          static_cast<CXFA_Object*>(FXJSE_Value_ToObject(GetAt(i), nullptr)));
-    }
+    for (int32_t i = 0; i < GetSize(); i++)
+      objArray.Add(static_cast<CXFA_Object*>(GetAt(i)->ToHostObject(nullptr)));

[dsinclair, 2016/06/02 15:27:52]

Can't use CXFA_ScriptContext::ToObject here because the includes become
circular.

[Tom Sepez, 2016/06/02 18:20:22]

That's usually a sign that the implementation should be in the .cpp file.

[dsinclair, 2016/06/02 18:58:05]

Done.

   }
 
   v8::Isolate* m_pIsolate;
 };
 
 struct XFA_RESOLVENODE_RS {
   XFA_RESOLVENODE_RS()
       : dwFlags(XFA_RESOVENODE_RSTYPE_Nodes), pScriptAttribute(NULL) {}
 
   ~XFA_RESOLVENODE_RS() { nodes.RemoveAll(); }
@@ skipping 10 matching lines @@
     }
     return valueArray.GetSize();
   }
 
   CXFA_ObjArray nodes;
   XFA_RESOVENODE_RSTYPE dwFlags;
   const XFA_SCRIPTATTRIBUTEINFO* pScriptAttribute;
 };
 
 #endif  // XFA_FXFA_PARSER_XFA_SCRIPT_H_