From 9c112f92d4c2046d5a4f8538f4d18b74a87649d4 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 13 Feb 2018 21:27:44 +0000 Subject: Cleanup CFX_XMLDoc::SaveXMLNode The CFX_XMLDoc::SaveXMLNode method is almost an exact copy of the CFX_XMLNode::SaveXMLNode. This CL removes the XMLDoc variant and calls the XMLNode method directly. This Removes the need to pass the CXFA_DocumentParser into CXFA_Document and we can instead pass in the CXFA_FFNotify object directly. Change-Id: Ic3c8c66375483fe73b44dd84064a1b71b039d61c Reviewed-on: https://pdfium-review.googlesource.com/26530 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fxfa/parser/cxfa_document.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_document.h') diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h index 4d1c417c5b..9dc8e52ab6 100644 --- a/xfa/fxfa/parser/cxfa_document.h +++ b/xfa/fxfa/parser/cxfa_document.h @@ -50,7 +50,6 @@ class CScript_LayoutPseudoModel; class CScript_LogPseudoModel; class CScript_SignaturePseudoModel; class CXFA_ContainerLayoutItem; -class CXFA_DocumentParser; class CXFA_FFNotify; class CXFA_LayoutItem; class CXFA_LayoutProcessor; @@ -59,16 +58,13 @@ class CXFA_Object; class CXFA_Document : public CXFA_NodeOwner { public: - explicit CXFA_Document(CXFA_DocumentParser* pParser); + explicit CXFA_Document(CXFA_FFNotify* notify); ~CXFA_Document() override; - virtual CXFA_FFNotify* GetNotify() const; - CFXJSE_Engine* InitScriptContext(CFXJS_Engine* fxjs_engine); CXFA_Node* GetRoot() const { return m_pRootNode; } - CFX_XMLDoc* GetXMLDoc() const; - + CXFA_FFNotify* GetNotify() const { return notify_.Get(); } CXFA_LocaleMgr* GetLocalMgr(); CXFA_Object* GetXFAObject(XFA_HashCode wsNodeNameHash); CXFA_Node* GetNodeByID(CXFA_Node* pRoot, const WideStringView& wsID); @@ -105,7 +101,7 @@ class CXFA_Document : public CXFA_NodeOwner { std::vector m_pPendingPageSet; private: - CXFA_DocumentParser* m_pParser; + UnownedPtr notify_; CXFA_Node* m_pRootNode; std::unique_ptr m_pScriptContext; std::unique_ptr m_pLayoutProcessor; -- cgit v1.2.3