From c757d9a6f90bb879ce2cdd4a756b7b0e1885eb25 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Mon, 23 Jan 2017 11:01:42 -0800
Subject: Remove some |void Release() { delete this; }| anti-pattern.

m_pSyntaxParser was unused.

Review-Url: https://codereview.chromium.org/2646203002
---
 xfa/fxfa/parser/cxfa_node.cpp          | 8 +++-----
 xfa/fxfa/parser/cxfa_simple_parser.cpp | 2 +-
 xfa/fxfa/parser/cxfa_xml_parser.h      | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'xfa/fxfa')

diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index bc2a10c08b..5411443e6a 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -511,7 +511,7 @@ CXFA_Node::~CXFA_Node() {
     pNode = pNext;
   }
   if (m_pXMLNode && IsOwnXMLNode())
-    m_pXMLNode->Release();
+    delete m_pXMLNode;
 }
 
 CXFA_Node* CXFA_Node::Clone(bool bRecursive) {
@@ -1406,10 +1406,8 @@ void CXFA_Node::Script_NodeClass_LoadXML(CFXJSE_Arguments* pArguments) {
     }
     pFakeRoot->SetFlag(XFA_NodeFlag_HasRemovedChildren, false);
   } else {
-    if (pFakeXMLRoot) {
-      pFakeXMLRoot->Release();
-      pFakeXMLRoot = nullptr;
-    }
+    delete pFakeXMLRoot;
+    pFakeXMLRoot = nullptr;
   }
 }
 
diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp
index 9f6fef9c1f..2417afaf1e 100644
--- a/xfa/fxfa/parser/cxfa_simple_parser.cpp
+++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp
@@ -747,7 +747,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Data(
         m_pFactory->CreateNode(XFA_XDPPACKET_Datasets, XFA_Element::DataGroup);
     if (!pNode) {
       if (pDataXMLNode != pXMLDocumentNode)
-        pDataXMLNode->Release();
+        delete pDataXMLNode;
       return nullptr;
     }
     CFX_WideString wsLocalName;
diff --git a/xfa/fxfa/parser/cxfa_xml_parser.h b/xfa/fxfa/parser/cxfa_xml_parser.h
index e49a9dd127..9393b7e597 100644
--- a/xfa/fxfa/parser/cxfa_xml_parser.h
+++ b/xfa/fxfa/parser/cxfa_xml_parser.h
@@ -32,8 +32,7 @@ class CXFA_XMLParser : public IFDE_XMLParser {
  protected:
   CFDE_XMLNode* m_pRoot;
   CFX_RetainPtr<IFGAS_Stream> m_pStream;
-  std::unique_ptr<CFDE_XMLSyntaxParser, ReleaseDeleter<CFDE_XMLSyntaxParser>>
-      m_pParser;
+  std::unique_ptr<CFDE_XMLSyntaxParser> m_pParser;
   CFDE_XMLNode* m_pParent;
   CFDE_XMLNode* m_pChild;
   CFX_StackTemplate<CFDE_XMLNode*> m_NodeStack;
-- 
cgit v1.2.3