Cleanup ownership in CXFA_ScriptContext.

xfa/fxfa/parser/xfa_script_imp.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_IMP_H_
 #define XFA_FXFA_PARSER_XFA_SCRIPT_IMP_H_
 
 #include <map>
+#include <memory>
+#include <vector>
 
 #include "fxjse/include/cfxjse_arguments.h"
 #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h"
 #include "xfa/fxfa/parser/xfa_document.h"
 #include "xfa/fxfa/parser/xfa_script.h"
 
 #define XFA_RESOLVENODE_TagName 0x0002
 
 class CXFA_ResolveProcessor;
 
 class CXFA_ScriptContext {
  public:
   explicit CXFA_ScriptContext(CXFA_Document* pDocument);
   ~CXFA_ScriptContext();
 
   void Initialize(v8::Isolate* pIsolate);
   void SetEventParam(CXFA_EventParam param) { m_eventParam = param; }
   CXFA_EventParam* GetEventParam() { return &m_eventParam; }
   FX_BOOL RunScript(XFA_SCRIPTLANGTYPE eScriptType,
                     const CFX_WideStringC& wsScript,
                     CFXJSE_Value* pRetValue,
                     CXFA_Object* pThisObject = NULL);
 
   int32_t ResolveObjects(CXFA_Object* refNode,
                          const CFX_WideStringC& wsExpression,
                          XFA_RESOLVENODE_RS& resolveNodeRS,
                          uint32_t dwStyles = XFA_RESOLVENODE_Children,
                          CXFA_Node* bindNode = NULL);
   CFXJSE_Value* GetJSValueFromMap(CXFA_Object* pObject);
-  void CacheList(CXFA_NodeList* pList) { m_CacheListArray.Add(pList); }
+  // This takes ownership of |pList|

[Lei Zhang, 2016/06/14 19:29:12]

No need, already implied by unique_ptr.

[dsinclair, 2016/06/14 20:19:43]

Done.

+  void AddToCacheList(std::unique_ptr<CXFA_NodeList> pList) {
+    m_CacheList.push_back(std::move(pList));

[Lei Zhang, 2016/06/14 19:29:12]

The Clang plugin may complain this is complex and belong in the .cpp file.

[dsinclair, 2016/06/14 20:19:43]

Moved.

+  }
   CXFA_Object* GetThisObject() const { return m_pThisObject; }
   v8::Isolate* GetRuntime() const { return m_pIsolate; }
 
   int32_t GetIndexByName(CXFA_Node* refNode);
   int32_t GetIndexByClassName(CXFA_Node* refNode);
   void GetSomExpression(CXFA_Node* refNode, CFX_WideString& wsExpression);
 
   void SetNodesOfRunScript(CXFA_NodeArray* pArray);
   void AddNodesOfRunScript(const CXFA_NodeArray& nodes);
   void AddNodesOfRunScript(CXFA_Node* pNode);
@@ skipping 29 matching lines @@
                                CFXJSE_Arguments& args);
   static int32_t NormalPropTypeGetter(CFXJSE_Value* pObject,
                                       const CFX_ByteStringC& szPropName,
                                       FX_BOOL bQueryIn);
   static int32_t GlobalPropTypeGetter(CFXJSE_Value* pObject,
                                       const CFX_ByteStringC& szPropName,
                                       FX_BOOL bQueryIn);
   FX_BOOL RunVariablesScript(CXFA_Node* pScriptNode);
   CXFA_Object* GetVariablesThis(CXFA_Object* pObject,
                                 FX_BOOL bScriptNode = FALSE);
-  void ReleaseVariablesMap();
   FX_BOOL IsStrictScopeInJavaScript();
   XFA_SCRIPTLANGTYPE GetType();
   CXFA_NodeArray& GetUpObjectArray() { return m_upObjectArray; }
   CXFA_Document* GetDocument() const { return m_pDocument; }
 
   static CXFA_Object* ToObject(CFXJSE_Value* pValue, CFXJSE_Class* pClass);
 
  private:
   void DefineJsContext();
   CFXJSE_Context* CreateVariablesContext(CXFA_Node* pScriptNode,
                                          CXFA_Node* pSubform);
   void DefineJsClass();
   void RemoveBuiltInObjs(CFXJSE_Context* pContext) const;
 
   CXFA_Document* m_pDocument;
-  CFXJSE_Context* m_pJsContext;
+  std::unique_ptr<CFXJSE_Context> m_JsContext;
   v8::Isolate* m_pIsolate;
   CFXJSE_Class* m_pJsClass;
   XFA_SCRIPTLANGTYPE m_eScriptType;
-  CFX_MapPtrTemplate<CXFA_Object*, CFXJSE_Value*> m_mapXFAToValue;
+  std::map<CXFA_Object*, std::unique_ptr<CFXJSE_Value>> m_mapObjectToValue;
   CFX_MapPtrTemplate<CXFA_Object*, CFXJSE_Context*> m_mapVariableToContext;
   CXFA_EventParam m_eventParam;
   CXFA_NodeArray m_upObjectArray;
-  CFX_ArrayTemplate<CXFA_NodeList*> m_CacheListArray;
+  // CacheList holds the NodeList items so we can clean them up when we're done.
+  std::vector<std::unique_ptr<CXFA_NodeList>> m_CacheList;
   CXFA_NodeArray* m_pScriptNodeArray;
-  CXFA_ResolveProcessor* m_pResolveProcessor;
-  CXFA_FM2JSContext* m_hFM2JSContext;
+  std::unique_ptr<CXFA_ResolveProcessor> m_ResolveProcessor;
+  std::unique_ptr<CXFA_FM2JSContext> m_FM2JSContext;
   CXFA_Object* m_pThisObject;
   uint32_t m_dwBuiltInInFlags;
   XFA_ATTRIBUTEENUM m_eRunAtType;
 };
 
 #endif  //  XFA_FXFA_PARSER_XFA_SCRIPT_IMP_H_