From 7ea611fb82308b4b8f9dc150a9d79334435c53b6 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 18 Sep 2018 17:50:35 +0000 Subject: Transfer ownership of nodes to top-level XML doc For XFA, XML nodes are owned by the XML doc that they were created by, but references to them are stored elsewhere. For a PDF document there is one top-level XML document created and retained when the initial XFA XML is parsed. Another can be created if loadXML is called by JS. In the existing code the XML doc that owns the newly created nodes is local to loadXML. So the nodes are destroyed right after putting refernces to them into the main XFA data structures. This CL adds in a method to transfer ownership of the XML nodes from one doc to another, and uses it to correctly retain the newly created nodes, by having them owned by the top-level XML doc. BUG=chromium:884664 Change-Id: Id29b4edbfe44aefb9713328e4e217e830f7e9e14 Reviewed-on: https://pdfium-review.googlesource.com/42690 Reviewed-by: Henrique Nakashima Commit-Queue: Ryan Harrison --- core/fxcrt/xml/cfx_xmldocument.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'core/fxcrt/xml/cfx_xmldocument.cpp') diff --git a/core/fxcrt/xml/cfx_xmldocument.cpp b/core/fxcrt/xml/cfx_xmldocument.cpp index f6e55551ed..5ce4aed694 100644 --- a/core/fxcrt/xml/cfx_xmldocument.cpp +++ b/core/fxcrt/xml/cfx_xmldocument.cpp @@ -12,3 +12,10 @@ CFX_XMLDocument::CFX_XMLDocument() { } CFX_XMLDocument::~CFX_XMLDocument() = default; + +void CFX_XMLDocument::AppendNodesFrom(CFX_XMLDocument* other) { + nodes_.reserve(nodes_.size() + other->nodes_.size()); + nodes_.insert(nodes_.end(), std::make_move_iterator(other->nodes_.begin()), + std::make_move_iterator(other->nodes_.end())); + other->nodes_.clear(); +} -- cgit v1.2.3