From e7d5c7f48ead8f5554105da9637fd9de1c093d67 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 12 Apr 2018 13:41:09 +0000 Subject: Remove CFX_XMLDoc and call the parser directly This CL removes the CFX_XMLDoc and calls the CFX_XMLParser directly from CXFA_DocumentParser. Change-Id: I4d715cca90cd15b5e1d79827e0bb2781e873e371 Reviewed-on: https://pdfium-review.googlesource.com/30251 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- core/fxcrt/xml/cfx_xmldoc.cpp | 31 ------------------------------- core/fxcrt/xml/cfx_xmldoc.h | 31 ------------------------------- 2 files changed, 62 deletions(-) delete mode 100644 core/fxcrt/xml/cfx_xmldoc.cpp delete mode 100644 core/fxcrt/xml/cfx_xmldoc.h (limited to 'core/fxcrt/xml') diff --git a/core/fxcrt/xml/cfx_xmldoc.cpp b/core/fxcrt/xml/cfx_xmldoc.cpp deleted file mode 100644 index c14255d432..0000000000 --- a/core/fxcrt/xml/cfx_xmldoc.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2017 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "core/fxcrt/xml/cfx_xmldoc.h" - -#include -#include - -#include "core/fxcrt/fx_codepage.h" -#include "core/fxcrt/xml/cfx_xmlchardata.h" -#include "core/fxcrt/xml/cfx_xmlelement.h" -#include "core/fxcrt/xml/cfx_xmlinstruction.h" -#include "core/fxcrt/xml/cfx_xmlnode.h" -#include "core/fxcrt/xml/cfx_xmltext.h" -#include "third_party/base/ptr_util.h" -#include "third_party/base/stl_util.h" - -CFX_XMLDoc::CFX_XMLDoc() : m_pRoot(pdfium::MakeUnique()) { - m_pRoot->AppendChild(new CFX_XMLInstruction(L"xml")); -} - -CFX_XMLDoc::~CFX_XMLDoc() {} - -bool CFX_XMLDoc::Load(const RetainPtr& pStream) { - ASSERT(pStream); - CFX_XMLParser parser(m_pRoot.get(), pStream); - return parser.Parse(); -} diff --git a/core/fxcrt/xml/cfx_xmldoc.h b/core/fxcrt/xml/cfx_xmldoc.h deleted file mode 100644 index 915acd325d..0000000000 --- a/core/fxcrt/xml/cfx_xmldoc.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2017 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef CORE_FXCRT_XML_CFX_XMLDOC_H_ -#define CORE_FXCRT_XML_CFX_XMLDOC_H_ - -#include -#include - -#include "core/fxcrt/cfx_seekablestreamproxy.h" -#include "core/fxcrt/retain_ptr.h" -#include "core/fxcrt/xml/cfx_xmlnode.h" -#include "core/fxcrt/xml/cfx_xmlparser.h" - -class CFX_XMLDoc { - public: - CFX_XMLDoc(); - ~CFX_XMLDoc(); - - bool Load(const RetainPtr& pStream); - - std::unique_ptr GetTree() { return std::move(m_pRoot); } - - private: - std::unique_ptr m_pRoot; -}; - -#endif // CORE_FXCRT_XML_CFX_XMLDOC_H_ -- cgit v1.2.3