1 files changed, 17 insertions, 15 deletions

diff --git a/core/fxcrt/xml/cfx_xmlnode.h b/core/fxcrt/xml/cfx_xmlnode.h
index 4c98a3b51a..95dc0acce9 100644
--- a/core/fxcrt/xml/cfx_xmlnode.h
+++ b/core/fxcrt/xml/cfx_xmlnode.h
@@ -19,39 +19,41 @@ enum FX_XMLNODETYPE {
   FX_XMLNODE_CharData,
 };
 
+class CFX_XMLDocument;
+
 class CFX_XMLNode {
  public:
   CFX_XMLNode();
   virtual ~CFX_XMLNode();
 
   virtual FX_XMLNODETYPE GetType() const = 0;
-  virtual std::unique_ptr<CFX_XMLNode> Clone() = 0;
+  virtual CFX_XMLNode* Clone(CFX_XMLDocument* doc) = 0;
   virtual void Save(const RetainPtr<IFX_SeekableWriteStream>& pXMLStream) = 0;
 
   CFX_XMLNode* GetRoot();
-  CFX_XMLNode* GetParent() const { return parent_.Get(); }
-  CFX_XMLNode* GetFirstChild() const { return first_child_.get(); }
-  CFX_XMLNode* GetNextSibling() const { return next_sibling_.get(); }
+  CFX_XMLNode* GetParent() const { return parent_; }
+  CFX_XMLNode* GetFirstChild() const { return first_child_; }
+  CFX_XMLNode* GetNextSibling() const { return next_sibling_; }
 
-  void AppendChild(std::unique_ptr<CFX_XMLNode> pNode);
-  void InsertChildNode(std::unique_ptr<CFX_XMLNode> pNode, int32_t index);
+  void AppendChild(CFX_XMLNode* pNode);
+  void InsertChildNode(CFX_XMLNode* pNode, int32_t index);
   void RemoveChildNode(CFX_XMLNode* pNode);
   void DeleteChildren();
 
-  CFX_XMLNode* GetLastChildForTesting() const { return last_child_.Get(); }
-  CFX_XMLNode* GetPrevSiblingForTesting() const { return prev_sibling_.Get(); }
+  CFX_XMLNode* GetLastChildForTesting() const { return last_child_; }
+  CFX_XMLNode* GetPrevSiblingForTesting() const { return prev_sibling_; }
 
  protected:
   WideString EncodeEntities(const WideString& value);
 
  private:
-  // A node owns its first child and it owns its next sibling. The rest
-  // are unowned pointers.
-  UnownedPtr<CFX_XMLNode> parent_;
-  UnownedPtr<CFX_XMLNode> last_child_;
-  UnownedPtr<CFX_XMLNode> prev_sibling_;
-  std::unique_ptr<CFX_XMLNode> first_child_;
-  std::unique_ptr<CFX_XMLNode> next_sibling_;
+  // The nodes are owned by the XML document. We do not know what order the
+  // nodes will be destroyed in so they can not be UnownedPtrs.
+  CFX_XMLNode* parent_ = nullptr;
+  CFX_XMLNode* first_child_ = nullptr;
+  CFX_XMLNode* last_child_ = nullptr;
+  CFX_XMLNode* next_sibling_ = nullptr;
+  CFX_XMLNode* prev_sibling_ = nullptr;
 };
 
 #endif  // CORE_FXCRT_XML_CFX_XMLNODE_H_