From eb9625c04876c45862fb30e48a4fd6d5998db0e9 Mon Sep 17 00:00:00 2001
From: npm <npm@chromium.org>
Date: Mon, 28 Nov 2016 12:31:13 -0800
Subject: Use unique pointers in CXFA_FMParse

Replaced CXFA_FMParse's returns to be unique pointers to prevent leaks.

Review-Url: https://codereview.chromium.org/2530933002
---
 xfa/fxfa/fm2js/xfa_expression.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'xfa/fxfa/fm2js/xfa_expression.h')

diff --git a/xfa/fxfa/fm2js/xfa_expression.h b/xfa/fxfa/fm2js/xfa_expression.h
index 236b51a6b0..f89a923565 100644
--- a/xfa/fxfa/fm2js/xfa_expression.h
+++ b/xfa/fxfa/fm2js/xfa_expression.h
@@ -46,7 +46,7 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression {
       bool isGlobal,
       const CFX_WideStringC& wsName,
       std::unique_ptr<CFX_WideStringCArray> pArguments,
-      CFX_ArrayTemplate<CXFA_FMExpression*>* pExpressions);
+      std::vector<std::unique_ptr<CXFA_FMExpression>>&& pExpressions);
   ~CXFA_FMFunctionDefinition() override;
 
   void ToJavaScript(CFX_WideTextBuf& javascript) override;
@@ -55,7 +55,7 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression {
  private:
   CFX_WideStringC m_wsName;
   std::unique_ptr<CFX_WideStringCArray> m_pArguments;
-  CFX_ArrayTemplate<CXFA_FMExpression*>* m_pExpressions;
+  std::vector<std::unique_ptr<CXFA_FMExpression>> m_pExpressions;
   bool m_isGlobal;
 };
 
@@ -88,17 +88,16 @@ class CXFA_FMExpExpression : public CXFA_FMExpression {
 
 class CXFA_FMBlockExpression : public CXFA_FMExpression {
  public:
-  // Takes ownership of |pExpressionList|.
   CXFA_FMBlockExpression(
       uint32_t line,
-      CFX_ArrayTemplate<CXFA_FMExpression*>* pExpressionList);
+      std::vector<std::unique_ptr<CXFA_FMExpression>>&& pExpressionList);
   ~CXFA_FMBlockExpression() override;
 
   void ToJavaScript(CFX_WideTextBuf& javascript) override;
   void ToImpliedReturnJS(CFX_WideTextBuf&) override;
 
  private:
-  CFX_ArrayTemplate<CXFA_FMExpression*>* m_pExpressionList;
+  std::vector<std::unique_ptr<CXFA_FMExpression>> m_ExpressionList;
 };
 
 class CXFA_FMDoExpression : public CXFA_FMExpression {
-- 
cgit v1.2.3