commit b2fb20e0f8e7ea368c541d35ccb61506041f7ddd
author Dan Sinclair <dsinclair@chromium.org> Tue Apr 04 15:09:44 2017 -0400
committer Chromium commit bot <commit-bot@chromium.org> Tue Apr 04 19:42:55 2017 +0000
tree 9fe1fda4d2e188001028a5dc99b670e8d3a9cb36
parent ee62ba2df7297147cccda472f229a8c82bfc22bc

Remove un-needed CFDE_XMLDeclaration

This was just used as the parent to CFDE_XMLCharData but didn't override
anything over CFDE_XMLNode. Switch CFDE_XMLCharData to inherit from
CFDE_XMLNode and remove CFDE_XMLDeclaration.

Change-Id: Ide7507c0d4a6886331b6cebeae0bd7f9e9d738fb
Reviewed-on: https://pdfium-review.googlesource.com/3671
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 5c0017d..961a510 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1406,7 +1406,6 @@
       "xfa/fde/ifde_txtedtpage.h",
       "xfa/fde/xml/cfde_xmlchardata.cpp",
       "xfa/fde/xml/cfde_xmlchardata.h",
-      "xfa/fde/xml/cfde_xmldeclaration.h",
       "xfa/fde/xml/cfde_xmldoc.cpp",
       "xfa/fde/xml/cfde_xmldoc.h",
       "xfa/fde/xml/cfde_xmlelement.cpp",

xfa/fde/xml/cfde_xmlchardata.cpp

diff --git a/xfa/fde/xml/cfde_xmlchardata.cpp b/xfa/fde/xml/cfde_xmlchardata.cpp
index 40e4730..2339307 100644
--- a/xfa/fde/xml/cfde_xmlchardata.cpp
+++ b/xfa/fde/xml/cfde_xmlchardata.cpp
@@ -7,7 +7,7 @@
 #include "xfa/fde/xml/cfde_xmlchardata.h"
 
 CFDE_XMLCharData::CFDE_XMLCharData(const CFX_WideString& wsCData)
-    : CFDE_XMLDeclaration(), m_wsCharData(wsCData) {}
+    : CFDE_XMLNode(), m_wsCharData(wsCData) {}
 
 CFDE_XMLCharData::~CFDE_XMLCharData() {}
 

xfa/fde/xml/cfde_xmlchardata.h

diff --git a/xfa/fde/xml/cfde_xmlchardata.h b/xfa/fde/xml/cfde_xmlchardata.h
index 308ec17..ea1d3aa 100644
--- a/xfa/fde/xml/cfde_xmlchardata.h
+++ b/xfa/fde/xml/cfde_xmlchardata.h
@@ -8,9 +8,9 @@
 #define XFA_FDE_XML_CFDE_XMLCHARDATA_H_
 
 #include "core/fxcrt/fx_string.h"
-#include "xfa/fde/xml/cfde_xmldeclaration.h"
+#include "xfa/fde/xml/cfde_xmlnode.h"
 
-class CFDE_XMLCharData : public CFDE_XMLDeclaration {
+class CFDE_XMLCharData : public CFDE_XMLNode {
  public:
   explicit CFDE_XMLCharData(const CFX_WideString& wsCData);
   ~CFDE_XMLCharData() override;

xfa/fde/xml/cfde_xmldeclaration.h

diff --git a/xfa/fde/xml/cfde_xmldeclaration.h b/xfa/fde/xml/cfde_xmldeclaration.h
deleted file mode 100644
index ade66c4..0000000
--- a/xfa/fde/xml/cfde_xmldeclaration.h
+++ /dev/null
@@ -1,18 +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 XFA_FDE_XML_CFDE_XMLDECLARATION_H_
-#define XFA_FDE_XML_CFDE_XMLDECLARATION_H_
-
-#include "xfa/fde/xml/cfde_xmlnode.h"
-
-class CFDE_XMLDeclaration : public CFDE_XMLNode {
- public:
-  CFDE_XMLDeclaration() {}
-  ~CFDE_XMLDeclaration() override {}
-};
-
-#endif  // XFA_FDE_XML_CFDE_XMLDECLARATION_H_