Cleanup XML parser code.

This Cl removes the CFDE_XMLSAXParser and CFDE_XMLDOMParser along with the
::LoadXML() method which would create them, it was never called. It also
cleans up the use of virtual in the various XML classes.

Review-Url: https://codereview.chromium.org/2067253002

6 files changed, 128 insertions, 446 deletions

diff --git a/xfa/fde/xml/fde_xml.h b/xfa/fde/xml/fde_xml.h
index b4601a9310..e9906beced 100644
--- a/xfa/fde/xml/fde_xml.h
+++ b/xfa/fde/xml/fde_xml.h
@@ -7,8 +7,7 @@
 #ifndef XFA_FDE_XML_FDE_XML_H_
 #define XFA_FDE_XML_FDE_XML_H_
 
-#include "xfa/fgas/crt/fgas_stream.h"
-#include "xfa/fgas/crt/fgas_utils.h"
+#include "core/fxcrt/include/fx_system.h"
 
 enum class FDE_XmlSyntaxResult {
   None,
@@ -40,25 +39,7 @@ struct FDE_XMLNODE {
   int32_t iNodeNum;
   FDE_XMLNODETYPE eNodeType;
 };
-typedef CFX_StackTemplate<FDE_XMLNODE> CFDE_XMLNodeStack;
 
 FX_BOOL FDE_IsXMLValidChar(FX_WCHAR ch);
 
-struct FDE_XMLREADERHANDLER {
-  void* pData;
-  void (*OnTagEnter)(FDE_XMLREADERHANDLER* pThis,
-                     FDE_XMLNODETYPE eType,
-                     const CFX_WideString& wsTagName);
-  void (*OnTagBreak)(FDE_XMLREADERHANDLER* pThis,
-                     const CFX_WideString& wsTagName);
-  void (*OnTagClose)(FDE_XMLREADERHANDLER* pThis,
-                     const CFX_WideString& wsTagName);
-  void (*OnAttribute)(FDE_XMLREADERHANDLER* pThis,
-                      const CFX_WideString& wsName,
-                      const CFX_WideString& wsValue);
-  void (*OnData)(FDE_XMLREADERHANDLER* pThis,
-                 FDE_XMLNODETYPE eType,
-                 const CFX_WideString& wsValue);
-};
-
 #endif  // XFA_FDE_XML_FDE_XML_H_
diff --git a/xfa/fde/xml/fde_xml_imp.cpp b/xfa/fde/xml/fde_xml_imp.cpp
index 6b7bdaaed3..b71d8b8f4f 100644
--- a/xfa/fde/xml/fde_xml_imp.cpp
+++ b/xfa/fde/xml/fde_xml_imp.cpp
@@ -870,45 +870,7 @@ void CFDE_XMLDoc::ReleaseParser() {
     m_pSyntaxParser = nullptr;
   }
 }
-FX_BOOL CFDE_XMLDoc::LoadXML(IFX_Stream* pXMLStream,
-                             int32_t iXMLPlaneSize,
-                             int32_t iTextDataSize,
-                             FDE_XMLREADERHANDLER* pHandler) {
-  if (!pXMLStream)
-    return FALSE;
 
-  Reset(TRUE);
-  iXMLPlaneSize = iXMLPlaneSize / 1024;
-  if (iXMLPlaneSize < 1) {
-    iXMLPlaneSize = 1;
-  }
-  iXMLPlaneSize *= 1024;
-  if (iXMLPlaneSize < 4096) {
-    iXMLPlaneSize = 4096;
-  }
-  iTextDataSize = iTextDataSize / 128;
-  if (iTextDataSize < 1) {
-    iTextDataSize = 1;
-  }
-  iTextDataSize *= 128;
-  if (iTextDataSize < 128) {
-    iTextDataSize = 128;
-  }
-  m_pStream = pXMLStream;
-  uint16_t wCodePage = m_pStream->GetCodePage();
-  if (wCodePage != FX_CODEPAGE_UTF16LE && wCodePage != FX_CODEPAGE_UTF16BE &&
-      wCodePage != FX_CODEPAGE_UTF8) {
-    m_pStream->SetCodePage(FX_CODEPAGE_UTF8);
-  }
-  m_pSyntaxParser = new CFDE_XMLSyntaxParser;
-
-  m_pSyntaxParser->Init(m_pStream, iXMLPlaneSize, iTextDataSize);
-  if (pHandler)
-    m_pXMLParser = new CFDE_XMLSAXParser(pHandler, m_pSyntaxParser);
-  else
-    m_pXMLParser = new CFDE_XMLDOMParser(m_pRoot, m_pSyntaxParser);
-  return TRUE;
-}
 FX_BOOL CFDE_XMLDoc::LoadXML(CFDE_XMLParser* pXMLParser) {
   if (!pXMLParser)
     return FALSE;
@@ -1060,237 +1022,6 @@ void CFDE_XMLDoc::SaveXML(IFX_Stream* pXMLStream, FX_BOOL bSaveBOM) {
     pXMLStream->SetLength(iPos);
   }
 }
-CFDE_XMLDOMParser::CFDE_XMLDOMParser(CFDE_XMLNode* pRoot,
-                                     CFDE_XMLSyntaxParser* pParser)
-    : m_pParser(pParser),
-      m_pParent(pRoot),
-      m_pChild(nullptr),
-      m_NodeStack(16),
-      m_ws1(),
-      m_ws2() {
-  m_NodeStack.Push(m_pParent);
-}
-CFDE_XMLDOMParser::~CFDE_XMLDOMParser() {
-  m_NodeStack.RemoveAll();
-  m_ws1.clear();
-  m_ws2.clear();
-}
-
-int32_t CFDE_XMLDOMParser::DoParser(IFX_Pause* pPause) {
-  FDE_XmlSyntaxResult syntaxParserResult;
-  int32_t iCount = 0;
-  while (TRUE) {
-    syntaxParserResult = m_pParser->DoSyntaxParse();
-    switch (syntaxParserResult) {
-      case FDE_XmlSyntaxResult::InstructionOpen:
-        break;
-      case FDE_XmlSyntaxResult::InstructionClose:
-        if (m_pChild->GetType() != FDE_XMLNODE_Instruction) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        }
-        m_pChild = m_pParent;
-        break;
-      case FDE_XmlSyntaxResult::ElementOpen:
-      case FDE_XmlSyntaxResult::ElementBreak:
-        break;
-      case FDE_XmlSyntaxResult::ElementClose:
-        if (m_pChild->GetType() != FDE_XMLNODE_Element) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        }
-        m_pParser->GetTagName(m_ws1);
-        ((CFDE_XMLElement*)m_pChild)->GetTagName(m_ws2);
-        if (m_ws1.GetLength() > 0 && m_ws1.Compare(m_ws2) != 0) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        }
-        m_NodeStack.Pop();
-        if (m_NodeStack.GetSize() < 1) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        }
-        m_pParent = (CFDE_XMLNode*)*m_NodeStack.GetTopElement();
-        m_pChild = m_pParent;
-        iCount++;
-        break;
-      case FDE_XmlSyntaxResult::TargetName:
-        m_pParser->GetTargetName(m_ws1);
-        m_pChild = new CFDE_XMLInstruction(m_ws1);
-        m_pParent->InsertChildNode(m_pChild);
-        m_ws1.clear();
-        break;
-      case FDE_XmlSyntaxResult::TagName:
-        m_pParser->GetTagName(m_ws1);
-        m_pChild = new CFDE_XMLElement(m_ws1);
-        m_pParent->InsertChildNode(m_pChild);
-        m_NodeStack.Push(m_pChild);
-        m_pParent = m_pChild;
-        break;
-      case FDE_XmlSyntaxResult::AttriName:
-        m_pParser->GetAttributeName(m_ws1);
-        break;
-      case FDE_XmlSyntaxResult::AttriValue:
-        if (!m_pChild) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        }
-        m_pParser->GetAttributeName(m_ws2);
-        if (m_pChild->GetType() == FDE_XMLNODE_Element) {
-          ((CFDE_XMLElement*)m_pChild)->SetString(m_ws1, m_ws2);
-        } else if (m_pChild->GetType() == FDE_XMLNODE_Instruction) {
-          ((CFDE_XMLInstruction*)m_pChild)->SetString(m_ws1, m_ws2);
-        }
-        m_ws1.clear();
-        break;
-      case FDE_XmlSyntaxResult::Text:
-        m_pParser->GetTextData(m_ws1);
-        m_pChild = new CFDE_XMLText(m_ws1);
-        m_pParent->InsertChildNode(m_pChild);
-        m_pChild = m_pParent;
-        break;
-      case FDE_XmlSyntaxResult::CData:
-        m_pParser->GetTextData(m_ws1);
-        m_pChild = new CFDE_XMLCharData(m_ws1);
-        m_pParent->InsertChildNode(m_pChild);
-        m_pChild = m_pParent;
-        break;
-      case FDE_XmlSyntaxResult::TargetData:
-        if (!m_pChild || m_pChild->GetType() != FDE_XMLNODE_Instruction) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        }
-        if (!m_ws1.IsEmpty()) {
-          ((CFDE_XMLInstruction*)m_pChild)->AppendData(m_ws1);
-        }
-        m_pParser->GetTargetData(m_ws1);
-        ((CFDE_XMLInstruction*)m_pChild)->AppendData(m_ws1);
-        m_ws1.clear();
-        break;
-      default:
-        break;
-    }
-    if (syntaxParserResult == FDE_XmlSyntaxResult::Error ||
-        syntaxParserResult == FDE_XmlSyntaxResult::EndOfString) {
-      break;
-    }
-    if (iCount > 500 && pPause && pPause->NeedToPauseNow())
-      break;
-  }
-  return m_pParser->GetStatus();
-}
-
-CFDE_XMLSAXParser::CFDE_XMLSAXParser(FDE_XMLREADERHANDLER* pHandler,
-                                     CFDE_XMLSyntaxParser* pParser)
-    : m_pHandler(pHandler),
-      m_pParser(pParser),
-      m_TagStack(16),
-      m_pTagTop(nullptr),
-      m_ws1(),
-      m_ws2() {}
-CFDE_XMLSAXParser::~CFDE_XMLSAXParser() {
-  m_TagStack.RemoveAll();
-  m_ws1.clear();
-  m_ws2.clear();
-}
-int32_t CFDE_XMLSAXParser::DoParser(IFX_Pause* pPause) {
-  FDE_XmlSyntaxResult syntaxParserResult;
-  int32_t iCount = 0;
-  while (TRUE) {
-    syntaxParserResult = m_pParser->DoSyntaxParse();
-    switch (syntaxParserResult) {
-      case FDE_XmlSyntaxResult::ElementBreak:
-        if (!m_pTagTop) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        }
-        if (m_pTagTop->eType == FDE_XMLNODE_Element) {
-          m_pHandler->OnTagBreak(m_pHandler, m_pTagTop->wsTagName);
-        }
-        break;
-      case FDE_XmlSyntaxResult::ElementClose:
-        if (!m_pTagTop || m_pTagTop->eType != FDE_XMLNODE_Element) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        }
-        m_pParser->GetTagName(m_ws1);
-        if (m_ws1.GetLength() > 0 && m_ws1.Compare(m_pTagTop->wsTagName) != 0) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        } else if (m_ws1.GetLength() == 0) {
-          m_pHandler->OnTagBreak(m_pHandler, m_pTagTop->wsTagName);
-        }
-        m_pHandler->OnTagClose(m_pHandler, m_pTagTop->wsTagName);
-        Pop();
-        iCount++;
-        break;
-      case FDE_XmlSyntaxResult::TargetName: {
-        m_pParser->GetTargetName(m_ws1);
-        CFDE_XMLTAG xmlTag;
-        xmlTag.wsTagName = m_ws1;
-        xmlTag.eType = FDE_XMLNODE_Instruction;
-        Push(xmlTag);
-        m_pHandler->OnTagEnter(m_pHandler, FDE_XMLNODE_Instruction,
-                               m_pTagTop->wsTagName);
-        m_ws1.clear();
-      } break;
-      case FDE_XmlSyntaxResult::TagName: {
-        m_pParser->GetTargetName(m_ws1);
-        CFDE_XMLTAG xmlTag;
-        xmlTag.wsTagName = m_ws1;
-        xmlTag.eType = FDE_XMLNODE_Element;
-        Push(xmlTag);
-        m_pHandler->OnTagEnter(m_pHandler, FDE_XMLNODE_Element,
-                               m_pTagTop->wsTagName);
-      } break;
-      case FDE_XmlSyntaxResult::AttriName:
-        m_pParser->GetTargetName(m_ws1);
-        break;
-      case FDE_XmlSyntaxResult::AttriValue:
-        m_pParser->GetAttributeName(m_ws2);
-        if (!m_pTagTop) {
-          syntaxParserResult = FDE_XmlSyntaxResult::Error;
-          break;
-        }
-        if (m_pTagTop->eType == FDE_XMLNODE_Element) {
-          m_pHandler->OnAttribute(m_pHandler, m_ws1, m_ws2);
-        }
-        m_ws1.clear();
-        break;
-      case FDE_XmlSyntaxResult::CData:
-        m_pParser->GetTextData(m_ws1);
-        m_pHandler->OnData(m_pHandler, FDE_XMLNODE_CharData, m_ws1);
-        break;
-      case FDE_XmlSyntaxResult::Text:
-        m_pParser->GetTextData(m_ws1);
-        m_pHandler->OnData(m_pHandler, FDE_XMLNODE_Text, m_ws1);
-        break;
-      case FDE_XmlSyntaxResult::TargetData:
-        m_pParser->GetTargetData(m_ws1);
-        m_pHandler->OnData(m_pHandler, FDE_XMLNODE_Instruction, m_ws1);
-        m_ws1.clear();
-        break;
-      default:
-        break;
-    }
-    if (syntaxParserResult == FDE_XmlSyntaxResult::Error ||
-        syntaxParserResult == FDE_XmlSyntaxResult::EndOfString) {
-      break;
-    }
-    if (iCount > 500 && pPause && pPause->NeedToPauseNow())
-      break;
-  }
-  return m_pParser->GetStatus();
-}
-
-inline void CFDE_XMLSAXParser::Push(const CFDE_XMLTAG& xmlTag) {
-  m_TagStack.Push(xmlTag);
-  m_pTagTop = m_TagStack.GetTopElement();
-}
-inline void CFDE_XMLSAXParser::Pop() {
-  m_TagStack.Pop();
-  m_pTagTop = m_TagStack.GetTopElement();
-}
 
 CFDE_BlockBuffer::CFDE_BlockBuffer(int32_t iAllocStep)
     : m_iDataLength(0),
diff --git a/xfa/fde/xml/fde_xml_imp.h b/xfa/fde/xml/fde_xml_imp.h
index 5a0931f482..b977d693d8 100644
--- a/xfa/fde/xml/fde_xml_imp.h
+++ b/xfa/fde/xml/fde_xml_imp.h
@@ -11,6 +11,7 @@
 #include "xfa/fde/xml/fde_xml.h"
 #include "xfa/fgas/crt/fgas_memory.h"
 #include "xfa/fgas/crt/fgas_stream.h"
+#include "xfa/fgas/crt/fgas_utils.h"
 
 class CFDE_BlockBuffer;
 class CFDE_XMLInstruction;
@@ -19,7 +20,6 @@ class CFDE_XMLText;
 class CFDE_XMLDoc;
 class CFDE_XMLDOMParser;
 class CFDE_XMLParser;
-class CFDE_XMLSAXParser;
 class CFDE_XMLSyntaxParser;
 
 class CFDE_XMLNode : public CFX_Target {
@@ -40,169 +40,177 @@ class CFDE_XMLNode : public CFX_Target {
   };
 
   CFDE_XMLNode();
+  virtual ~CFDE_XMLNode();
 
   virtual void Release() { delete this; }
   virtual FDE_XMLNODETYPE GetType() const { return FDE_XMLNODE_Unknown; }
-  virtual int32_t CountChildNodes() const;
-  virtual CFDE_XMLNode* GetChildNode(int32_t index) const;
-  virtual int32_t GetChildNodeIndex(CFDE_XMLNode* pNode) const;
-  virtual CFDE_XMLNode* GetPath(const FX_WCHAR* pPath,
-                                int32_t iLength = -1,
-                                FX_BOOL bQualifiedName = TRUE) const;
-  virtual int32_t InsertChildNode(CFDE_XMLNode* pNode, int32_t index = -1);
-  virtual void RemoveChildNode(CFDE_XMLNode* pNode);
-  virtual void DeleteChildren();
-  virtual CFDE_XMLNode* GetNodeItem(CFDE_XMLNode::NodeItem eItem) const;
-  virtual int32_t GetNodeLevel() const;
-  virtual FX_BOOL InsertNodeItem(CFDE_XMLNode::NodeItem eItem,
-                                 CFDE_XMLNode* pNode);
-  virtual CFDE_XMLNode* RemoveNodeItem(CFDE_XMLNode::NodeItem eItem);
   virtual CFDE_XMLNode* Clone(FX_BOOL bRecursive);
-  virtual void SaveXMLNode(IFX_Stream* pXMLStream);
 
- public:
-  ~CFDE_XMLNode();
+  int32_t CountChildNodes() const;
+  CFDE_XMLNode* GetChildNode(int32_t index) const;
+  int32_t GetChildNodeIndex(CFDE_XMLNode* pNode) const;
+  int32_t InsertChildNode(CFDE_XMLNode* pNode, int32_t index = -1);
+  void RemoveChildNode(CFDE_XMLNode* pNode);
+  void DeleteChildren();
   void CloneChildren(CFDE_XMLNode* pClone);
+
+  CFDE_XMLNode* GetPath(const FX_WCHAR* pPath,
+                        int32_t iLength = -1,
+                        FX_BOOL bQualifiedName = TRUE) const;
+
+  int32_t GetNodeLevel() const;
+  CFDE_XMLNode* GetNodeItem(CFDE_XMLNode::NodeItem eItem) const;
+  FX_BOOL InsertNodeItem(CFDE_XMLNode::NodeItem eItem, CFDE_XMLNode* pNode);
+  CFDE_XMLNode* RemoveNodeItem(CFDE_XMLNode::NodeItem eItem);
+
+  void SaveXMLNode(IFX_Stream* pXMLStream);
+
   CFDE_XMLNode* m_pParent;
   CFDE_XMLNode* m_pChild;
   CFDE_XMLNode* m_pPrior;
   CFDE_XMLNode* m_pNext;
 };
+
 class CFDE_XMLInstruction : public CFDE_XMLNode {
  public:
   CFDE_XMLInstruction(const CFX_WideString& wsTarget);
-  virtual void Release() { delete this; }
-  virtual FDE_XMLNODETYPE GetType() const { return FDE_XMLNODE_Instruction; }
-  virtual CFDE_XMLNode* Clone(FX_BOOL bRecursive);
-  virtual void GetTargetName(CFX_WideString& wsTarget) const {
-    wsTarget = m_wsTarget;
-  }
-  virtual int32_t CountAttributes() const;
-  virtual FX_BOOL GetAttribute(int32_t index,
-                               CFX_WideString& wsAttriName,
-                               CFX_WideString& wsAttriValue) const;
-  virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const;
-  virtual void GetString(const FX_WCHAR* pwsAttriName,
-                         CFX_WideString& wsAttriValue,
-                         const FX_WCHAR* pwsDefValue = nullptr) const;
-  virtual void SetString(const CFX_WideString& wsAttriName,
-                         const CFX_WideString& wsAttriValue);
-  virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName,
-                             int32_t iDefValue = 0) const;
-  virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue);
-  virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName,
-                            FX_FLOAT fDefValue = 0) const;
-  virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue);
-  virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName);
-  virtual int32_t CountData() const;
-  virtual FX_BOOL GetData(int32_t index, CFX_WideString& wsData) const;
-  virtual void AppendData(const CFX_WideString& wsData);
-  virtual void RemoveData(int32_t index);
+  ~CFDE_XMLInstruction() override {}
+
+  // CFDE_XMLNode
+  void Release() override { delete this; }
+  FDE_XMLNODETYPE GetType() const override { return FDE_XMLNODE_Instruction; }
+  CFDE_XMLNode* Clone(FX_BOOL bRecursive) override;
+
+  void GetTargetName(CFX_WideString& wsTarget) const { wsTarget = m_wsTarget; }
+  int32_t CountAttributes() const;
+  FX_BOOL GetAttribute(int32_t index,
+                       CFX_WideString& wsAttriName,
+                       CFX_WideString& wsAttriValue) const;
+  FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const;
+  void GetString(const FX_WCHAR* pwsAttriName,
+                 CFX_WideString& wsAttriValue,
+                 const FX_WCHAR* pwsDefValue = nullptr) const;
+  void SetString(const CFX_WideString& wsAttriName,
+                 const CFX_WideString& wsAttriValue);
+  int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const;
+  void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue);
+  FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const;
+  void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue);
+  void RemoveAttribute(const FX_WCHAR* pwsAttriName);
+  int32_t CountData() const;
+  FX_BOOL GetData(int32_t index, CFX_WideString& wsData) const;
+  void AppendData(const CFX_WideString& wsData);
+  void RemoveData(int32_t index);
 
- public:
-  ~CFDE_XMLInstruction() {}
   CFX_WideString m_wsTarget;
   CFX_WideStringArray m_Attributes;
   CFX_WideStringArray m_TargetData;
 };
+
 class CFDE_XMLElement : public CFDE_XMLNode {
  public:
   CFDE_XMLElement(const CFX_WideString& wsTag);
-  virtual void Release() { delete this; }
-  virtual FDE_XMLNODETYPE GetType() const { return FDE_XMLNODE_Element; }
-  virtual CFDE_XMLNode* Clone(FX_BOOL bRecursive);
-  virtual void GetTagName(CFX_WideString& wsTag) const;
-  virtual void GetLocalTagName(CFX_WideString& wsTag) const;
-  virtual void GetNamespacePrefix(CFX_WideString& wsPrefix) const;
-  virtual void GetNamespaceURI(CFX_WideString& wsNamespace) const;
-  virtual int32_t CountAttributes() const;
-  virtual FX_BOOL GetAttribute(int32_t index,
-                               CFX_WideString& wsAttriName,
-                               CFX_WideString& wsAttriValue) const;
-  virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const;
-  virtual void GetString(const FX_WCHAR* pwsAttriName,
-                         CFX_WideString& wsAttriValue,
-                         const FX_WCHAR* pwsDefValue = nullptr) const;
-  virtual void SetString(const CFX_WideString& wsAttriName,
-                         const CFX_WideString& wsAttriValue);
-  virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName,
-                             int32_t iDefValue = 0) const;
-  virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue);
-  virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName,
-                            FX_FLOAT fDefValue = 0) const;
-  virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue);
-  virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName);
-  virtual void GetTextData(CFX_WideString& wsText) const;
-  virtual void SetTextData(const CFX_WideString& wsText);
+  ~CFDE_XMLElement() override;
+
+  // CFDE_XMLNode
+  void Release() override { delete this; }
+  FDE_XMLNODETYPE GetType() const override { return FDE_XMLNODE_Element; }
+  CFDE_XMLNode* Clone(FX_BOOL bRecursive) override;
+
+  void GetTagName(CFX_WideString& wsTag) const;
+  void GetLocalTagName(CFX_WideString& wsTag) const;
+
+  void GetNamespacePrefix(CFX_WideString& wsPrefix) const;
+  void GetNamespaceURI(CFX_WideString& wsNamespace) const;
+
+  int32_t CountAttributes() const;
+  FX_BOOL GetAttribute(int32_t index,
+                       CFX_WideString& wsAttriName,
+                       CFX_WideString& wsAttriValue) const;
+  FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const;
+  void RemoveAttribute(const FX_WCHAR* pwsAttriName);
+
+  void GetString(const FX_WCHAR* pwsAttriName,
+                 CFX_WideString& wsAttriValue,
+                 const FX_WCHAR* pwsDefValue = nullptr) const;
+  void SetString(const CFX_WideString& wsAttriName,
+                 const CFX_WideString& wsAttriValue);
+
+  int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const;
+  void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue);
+
+  FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const;
+  void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue);
+
+  void GetTextData(CFX_WideString& wsText) const;
+  void SetTextData(const CFX_WideString& wsText);
 
- public:
-  ~CFDE_XMLElement();
   CFX_WideString m_wsTag;
   CFX_WideStringArray m_Attributes;
 };
+
 class CFDE_XMLText : public CFDE_XMLNode {
  public:
   CFDE_XMLText(const CFX_WideString& wsText);
-  virtual void Release() { delete this; }
-  virtual FDE_XMLNODETYPE GetType() const { return FDE_XMLNODE_Text; }
-  virtual CFDE_XMLNode* Clone(FX_BOOL bRecursive);
-  virtual void GetText(CFX_WideString& wsText) const { wsText = m_wsText; }
-  virtual void SetText(const CFX_WideString& wsText) { m_wsText = wsText; }
+  ~CFDE_XMLText() override {}
+
+  // CFDE_XMLNode
+  void Release() override { delete this; }
+  FDE_XMLNODETYPE GetType() const override { return FDE_XMLNODE_Text; }
+  CFDE_XMLNode* Clone(FX_BOOL bRecursive) override;
+
+  void GetText(CFX_WideString& wsText) const { wsText = m_wsText; }
+  void SetText(const CFX_WideString& wsText) { m_wsText = wsText; }
 
- public:
-  ~CFDE_XMLText() {}
   CFX_WideString m_wsText;
 };
+
 class CFDE_XMLDeclaration : public CFDE_XMLNode {
  public:
   CFDE_XMLDeclaration() : CFDE_XMLNode() {}
+  ~CFDE_XMLDeclaration() override {}
 };
+
 class CFDE_XMLCharData : public CFDE_XMLDeclaration {
  public:
   CFDE_XMLCharData(const CFX_WideString& wsCData);
+  ~CFDE_XMLCharData() override {}
 
-  virtual void Release() { delete this; }
-  virtual FDE_XMLNODETYPE GetType() const { return FDE_XMLNODE_CharData; }
-  virtual CFDE_XMLNode* Clone(FX_BOOL bRecursive);
-  virtual void GetCharData(CFX_WideString& wsCharData) const {
+  void Release() override { delete this; }
+  FDE_XMLNODETYPE GetType() const override { return FDE_XMLNODE_CharData; }
+  CFDE_XMLNode* Clone(FX_BOOL bRecursive) override;
+
+  void GetCharData(CFX_WideString& wsCharData) const {
     wsCharData = m_wsCharData;
   }
-  virtual void SetCharData(const CFX_WideString& wsCData) {
-    m_wsCharData = wsCData;
-  }
-
- public:
-  ~CFDE_XMLCharData() {}
+  void SetCharData(const CFX_WideString& wsCData) { m_wsCharData = wsCData; }
 
   CFX_WideString m_wsCharData;
 };
+
 class CFDE_XMLDoc : public CFX_Target {
  public:
   CFDE_XMLDoc();
-  ~CFDE_XMLDoc();
-  virtual void Release() { delete this; }
-  virtual FX_BOOL LoadXML(IFX_Stream* pXMLStream,
-                          int32_t iXMLPlaneSize = 8192,
-                          int32_t iTextDataSize = 256,
-                          FDE_XMLREADERHANDLER* pHandler = nullptr);
-  virtual FX_BOOL LoadXML(CFDE_XMLParser* pXMLParser);
-  virtual int32_t DoLoad(IFX_Pause* pPause = nullptr);
-  virtual void CloseXML();
-  virtual CFDE_XMLNode* GetRoot() const { return m_pRoot; }
-  virtual void SaveXML(IFX_Stream* pXMLStream = nullptr,
-                       FX_BOOL bSaveBOM = TRUE);
-  virtual void SaveXMLNode(IFX_Stream* pXMLStream, CFDE_XMLNode* pNode);
+  ~CFDE_XMLDoc() override;
+
+  void Release() { delete this; }
+  FX_BOOL LoadXML(CFDE_XMLParser* pXMLParser);
+  int32_t DoLoad(IFX_Pause* pPause = nullptr);
+  void CloseXML();
+  CFDE_XMLNode* GetRoot() const { return m_pRoot; }
+  void SaveXML(IFX_Stream* pXMLStream = nullptr, FX_BOOL bSaveBOM = TRUE);
+  void SaveXMLNode(IFX_Stream* pXMLStream, CFDE_XMLNode* pNode);
 
  protected:
+  void Reset(FX_BOOL bInitRoot);
+  void ReleaseParser();
+
   IFX_Stream* m_pStream;
   int32_t m_iStatus;
   CFDE_XMLNode* m_pRoot;
   CFDE_XMLSyntaxParser* m_pSyntaxParser;
   CFDE_XMLParser* m_pXMLParser;
-  void Reset(FX_BOOL bInitRoot);
-  void ReleaseParser();
 };
-typedef CFX_StackTemplate<CFDE_XMLNode*> CFDE_XMLDOMNodeStack;
 
 class CFDE_XMLParser {
  public:
@@ -212,51 +220,6 @@ class CFDE_XMLParser {
   virtual int32_t DoParser(IFX_Pause* pPause) = 0;
 };
 
-class CFDE_XMLDOMParser : public CFDE_XMLParser, public CFX_Target {
- public:
-  CFDE_XMLDOMParser(CFDE_XMLNode* pRoot, CFDE_XMLSyntaxParser* pParser);
-  ~CFDE_XMLDOMParser();
-
-  virtual void Release() { delete this; }
-  virtual int32_t DoParser(IFX_Pause* pPause);
-
- private:
-  CFDE_XMLSyntaxParser* m_pParser;
-  CFDE_XMLNode* m_pParent;
-  CFDE_XMLNode* m_pChild;
-  CFDE_XMLDOMNodeStack m_NodeStack;
-  CFX_WideString m_ws1;
-  CFX_WideString m_ws2;
-};
-class CFDE_XMLTAG : public CFX_Target {
- public:
-  CFDE_XMLTAG() : eType(FDE_XMLNODE_Unknown) {}
-  CFDE_XMLTAG(const CFDE_XMLTAG& src)
-      : wsTagName(src.wsTagName), eType(src.eType) {}
-  CFX_WideString wsTagName;
-  FDE_XMLNODETYPE eType;
-};
-typedef CFX_ObjectStackTemplate<CFDE_XMLTAG> CFDE_XMLTagStack;
-class CFDE_XMLSAXParser : public CFDE_XMLParser, public CFX_Target {
- public:
-  CFDE_XMLSAXParser(FDE_XMLREADERHANDLER* pHandler,
-                    CFDE_XMLSyntaxParser* pParser);
-  ~CFDE_XMLSAXParser();
-
-  virtual void Release() { delete this; }
-  virtual int32_t DoParser(IFX_Pause* pPause);
-
- private:
-  void Push(const CFDE_XMLTAG& xmlTag);
-  void Pop();
-  FDE_XMLREADERHANDLER* m_pHandler;
-  CFDE_XMLSyntaxParser* m_pParser;
-  CFDE_XMLTagStack m_TagStack;
-  CFDE_XMLTAG* m_pTagTop;
-  CFX_WideString m_ws1;
-  CFX_WideString m_ws2;
-};
-
 class CFDE_BlockBuffer : public CFX_Target {
  public:
   CFDE_BlockBuffer(int32_t iAllocStep = 1024 * 1024);
@@ -285,6 +248,7 @@ class CFDE_BlockBuffer : public CFX_Target {
                                      int32_t& iBlockIndex,
                                      int32_t& iInnerIndex) const;
   void ClearBuffer();
+
   CFX_ArrayTemplate<FX_WCHAR*> m_BlockArray;
   int32_t m_iDataLength;
   int32_t m_iBufferSize;
@@ -296,11 +260,14 @@ class CFDE_XMLSyntaxParser : public CFX_Target {
  public:
   CFDE_XMLSyntaxParser();
   ~CFDE_XMLSyntaxParser();
+
   void Release() { delete this; }
   void Init(IFX_Stream* pStream,
             int32_t iXMLPlaneSize,
             int32_t iTextDataSize = 256);
+
   FDE_XmlSyntaxResult DoSyntaxParse();
+
   int32_t GetStatus() const;
   int32_t GetCurrentPos() const {
     return m_iParsedChars + (m_pStart - m_pBuffer);
@@ -352,6 +319,8 @@ class CFDE_XMLSyntaxParser : public CFX_Target {
     TargetData
   };
 
+  void ParseTextChar(FX_WCHAR ch);
+
   IFX_Stream* m_pStream;
   int32_t m_iXMLPlaneSize;
   int32_t m_iCurrentPos;
@@ -365,7 +334,7 @@ class CFDE_XMLSyntaxParser : public CFX_Target {
   FX_WCHAR* m_pStart;
   FX_WCHAR* m_pEnd;
   FDE_XMLNODE m_CurNode;
-  CFDE_XMLNodeStack m_XMLNodeStack;
+  CFX_StackTemplate<FDE_XMLNODE> m_XMLNodeStack;
   CFDE_BlockBuffer m_BlockBuffer;
   int32_t m_iAllocStep;
   int32_t& m_iDataLength;
@@ -378,7 +347,6 @@ class CFDE_XMLSyntaxParser : public CFX_Target {
   int32_t m_iEntityStart;
   CFX_DWordStack m_SkipStack;
   FX_WCHAR m_SkipChar;
-  inline void ParseTextChar(FX_WCHAR ch);
 };
 
 #endif  // XFA_FDE_XML_FDE_XML_IMP_H_
diff --git a/xfa/fxfa/parser/xfa_parser.h b/xfa/fxfa/parser/xfa_parser.h
index 5ccc1af199..b6c81e9f18 100644
--- a/xfa/fxfa/parser/xfa_parser.h
+++ b/xfa/fxfa/parser/xfa_parser.h
@@ -15,6 +15,7 @@ class IXFA_Parser {
  public:
   static IXFA_Parser* Create(CXFA_Document* pFactory,
                              FX_BOOL bDocumentParser = FALSE);
+
   virtual ~IXFA_Parser() {}
   virtual void Release() = 0;
   virtual int32_t StartParse(IFX_FileRead* pStream,
diff --git a/xfa/fxfa/parser/xfa_parser_imp.h b/xfa/fxfa/parser/xfa_parser_imp.h
index 2485ddfcd2..1f117be64e 100644
--- a/xfa/fxfa/parser/xfa_parser_imp.h
+++ b/xfa/fxfa/parser/xfa_parser_imp.h
@@ -109,7 +109,6 @@ class CXFA_DocumentParser : public IXFA_Parser {
   CXFA_FFNotify* m_pNotify;
   CXFA_Document* m_pDocument;
 };
-typedef CFX_StackTemplate<CFDE_XMLNode*> CXFA_XMLNodeStack;
 
 class CXFA_XMLParser : public CFDE_XMLParser {
  public:
@@ -131,7 +130,7 @@ class CXFA_XMLParser : public CFDE_XMLParser {
   CFDE_XMLSyntaxParser* m_pParser;
   CFDE_XMLNode* m_pParent;
   CFDE_XMLNode* m_pChild;
-  CXFA_XMLNodeStack m_NodeStack;
+  CFX_StackTemplate<CFDE_XMLNode*> m_NodeStack;
   CFX_WideString m_ws1;
   CFX_WideString m_ws2;
   FDE_XmlSyntaxResult m_syntaxParserResult;
diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h
index d6633a4c7f..5b8057526a 100644
--- a/xfa/fxfa/parser/xfa_utils.h
+++ b/xfa/fxfa/parser/xfa_utils.h
@@ -8,6 +8,8 @@
 #define XFA_FXFA_PARSER_XFA_UTILS_H_
 
 #include "xfa/fde/xml/fde_xml.h"
+#include "xfa/fgas/crt/fgas_stream.h"
+#include "xfa/fgas/crt/fgas_utils.h"
 #include "xfa/fxfa/include/fxfa_basic.h"
 
 class CFDE_XMLElement;