diff options
| -rw-r--r-- | core/fxcrt/xml/cfx_xmldocument.cpp | 7 | ||||
| -rw-r--r-- | core/fxcrt/xml/cfx_xmldocument.h | 6 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_node.cpp | 19 |
3 files changed, 20 insertions, 12 deletions
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(); +} diff --git a/core/fxcrt/xml/cfx_xmldocument.h b/core/fxcrt/xml/cfx_xmldocument.h index a568f8390f..7d6f02b48d 100644 --- a/core/fxcrt/xml/cfx_xmldocument.h +++ b/core/fxcrt/xml/cfx_xmldocument.h @@ -29,6 +29,12 @@ class CFX_XMLDocument { return static_cast<T*>(nodes_.back().get()); } + // Transfers ownership of entries in |nodes_| from |other| to |this|. + // This is used in CJX_Node::loadXML to transfer ownership of the newly + // created nodes to the top-level XML doc for the PDF, after parsing an XML + // blob. + void AppendNodesFrom(CFX_XMLDocument* other); + private: std::vector<std::unique_ptr<CFX_XMLNode>> nodes_; UnownedPtr<CFX_XMLElement> root_; diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp index 8876628c3b..49cd041c88 100644 --- a/fxjs/xfa/cjx_node.cpp +++ b/fxjs/xfa/cjx_node.cpp @@ -221,6 +221,10 @@ CJS_Result CJX_Node::loadXML(CFX_V8* runtime, if (!pXMLNode) return CJS_Result::Success(); + CFX_XMLDocument* top_xml_doc = + GetXFANode()->GetDocument()->GetNotify()->GetHDOC()->GetXMLDocument(); + top_xml_doc->AppendNodesFrom(pParser->GetXMLDoc().get()); + if (bIgnoreRoot && (pXMLNode->GetType() != FX_XMLNODE_Element || XFA_RecognizeRichText(static_cast<CFX_XMLElement*>(pXMLNode)))) { @@ -239,19 +243,10 @@ CJS_Result CJX_Node::loadXML(CFX_V8* runtime, CFX_XMLNode* pThisXMLRoot = GetXFANode()->GetXMLMappingNode(); CFX_XMLNode* clone; if (pThisXMLRoot) { - clone = pThisXMLRoot->Clone(GetXFANode() - ->GetDocument() - ->GetNotify() - ->GetHDOC() - ->GetXMLDocument()); + clone = pThisXMLRoot->Clone(top_xml_doc); } else { - clone = GetXFANode() - ->GetDocument() - ->GetNotify() - ->GetHDOC() - ->GetXMLDocument() - ->CreateNode<CFX_XMLElement>( - WideString(GetXFANode()->GetClassName())); + clone = top_xml_doc->CreateNode<CFX_XMLElement>( + WideString(GetXFANode()->GetClassName())); } pFakeXMLRoot = clone; } |