From 369fe1f7f9f3a424ee3cf8f992c3128db27fa479 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Mar 2017 16:03:43 -0700 Subject: Remove CFX_ArrayTemplate in CXFA_ValueArray Change-Id: I68f317b9fb9b162a5d99cdacc619c85f96a5bf52 Reviewed-on: https://pdfium-review.googlesource.com/3239 Commit-Queue: dsinclair Reviewed-by: dsinclair --- xfa/fxfa/parser/xfa_resolvenode_rs.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/parser/xfa_resolvenode_rs.h') diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h index a60ef9a3c6..a30d540ef0 100644 --- a/xfa/fxfa/parser/xfa_resolvenode_rs.h +++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h @@ -8,6 +8,7 @@ #define XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_ #include +#include #include #include "fxjs/cfxjse_value.h" @@ -45,16 +46,17 @@ struct XFA_RESOLVENODE_RS { XFA_RESOLVENODE_RS(); ~XFA_RESOLVENODE_RS(); - int32_t GetAttributeResult(CXFA_ValueArray& valueArray) const { + size_t GetAttributeResult(CXFA_ValueArray* valueArray) const { if (pScriptAttribute && pScriptAttribute->eValueType == XFA_SCRIPT_Object) { for (CXFA_Object* pObject : objects) { - auto pValue = pdfium::MakeUnique(valueArray.m_pIsolate); + auto pValue = pdfium::MakeUnique(valueArray->m_pIsolate); (pObject->*(pScriptAttribute->lpfnCallback))( - pValue.get(), false, (XFA_ATTRIBUTE)pScriptAttribute->eAttribute); - valueArray.Add(pValue.release()); + pValue.get(), false, + static_cast(pScriptAttribute->eAttribute)); + valueArray->m_Values.push_back(std::move(pValue)); } } - return valueArray.GetSize(); + return valueArray->m_Values.size(); } std::vector objects; // Not owned. -- cgit v1.2.3