diff options
Diffstat (limited to 'xfa/fxfa/parser/xfa_resolvenode_rs.h')
| -rw-r--r-- | xfa/fxfa/parser/xfa_resolvenode_rs.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h index 86960abecc..7039c61ee9 100644 --- a/xfa/fxfa/parser/xfa_resolvenode_rs.h +++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h @@ -7,13 +7,10 @@ #ifndef XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_ #define XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_ -#include <memory> -#include <utility> #include <vector> -#include "fxjs/cfxjse_value.h" -#include "third_party/base/ptr_util.h" -#include "xfa/fxfa/fxfa.h" +#include "core/fxcrt/unowned_ptr.h" +#include "fxjs/xfa/cjx_object.h" #include "xfa/fxfa/parser/cxfa_object.h" #define XFA_RESOLVENODE_Children 0x0001 @@ -40,14 +37,13 @@ struct XFA_RESOLVENODE_RS { XFA_RESOLVENODE_RS(); ~XFA_RESOLVENODE_RS(); - std::vector<CXFA_Object*> objects; // Not owned. - XFA_ResolveNode_RSType dwFlags; - const XFA_SCRIPTATTRIBUTEINFO* pScriptAttribute; + XFA_ResolveNode_RSType dwFlags = XFA_ResolveNode_RSType_Nodes; + std::vector<UnownedPtr<CXFA_Object>> objects; + UnownedPtr<const XFA_SCRIPTATTRIBUTEINFO> pScriptAttribute; }; -inline XFA_RESOLVENODE_RS::XFA_RESOLVENODE_RS() - : dwFlags(XFA_ResolveNode_RSType_Nodes), pScriptAttribute(nullptr) {} +inline XFA_RESOLVENODE_RS::XFA_RESOLVENODE_RS() = default; -inline XFA_RESOLVENODE_RS::~XFA_RESOLVENODE_RS() {} +inline XFA_RESOLVENODE_RS::~XFA_RESOLVENODE_RS() = default; #endif // XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_ |