Chromium Code Reviews| Index: xfa/fxfa/fm2js/xfa_expression.h |
| diff --git a/xfa/fxfa/fm2js/xfa_expression.h b/xfa/fxfa/fm2js/xfa_expression.h |
| index a19df268b8706c73b61b2d3c03e068263d9c3c79..92b112d0b59eecf758b7120439594e0bf93753d3 100644 |
| --- a/xfa/fxfa/fm2js/xfa_expression.h |
| +++ b/xfa/fxfa/fm2js/xfa_expression.h |
| @@ -40,13 +40,13 @@ class CXFA_FMExpression { |
| class CXFA_FMFunctionDefinition : public CXFA_FMExpression { |
| public: |
| - // Takes ownership of |pExpressions|. |
| + // Takes ownership of |pArguments| and |pExpressions|. |
|
dsinclair
2016/12/08 21:51:33
Can you either rename these to |arguments| and |ex
Tom Sepez
2016/12/08 23:10:22
Done. They are no longer pointers but rvalue refe
|
| CXFA_FMFunctionDefinition( |
| uint32_t line, |
| bool isGlobal, |
| const CFX_WideStringC& wsName, |
| - std::unique_ptr<CFX_WideStringCArray> pArguments, |
| - std::vector<std::unique_ptr<CXFA_FMExpression>>&& pExpressions); |
| + std::vector<CFX_WideStringC>&& arguments, |
| + std::vector<std::unique_ptr<CXFA_FMExpression>>&& expressions); |
| ~CXFA_FMFunctionDefinition() override; |
| void ToJavaScript(CFX_WideTextBuf& javascript) override; |
| @@ -54,7 +54,7 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression { |
| private: |
| CFX_WideStringC m_wsName; |
| - std::unique_ptr<CFX_WideStringCArray> m_pArguments; |
| + std::vector<CFX_WideStringC> m_pArguments; |
| std::vector<std::unique_ptr<CXFA_FMExpression>> m_pExpressions; |
| bool m_isGlobal; |
| }; |