diff options
| author | tsepez <tsepez@chromium.org> | 2017-01-23 11:01:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2017-01-23 11:01:42 -0800 |
| commit | c757d9a6f90bb879ce2cdd4a756b7b0e1885eb25 (patch) | |
| tree | 34847e86907f80d508598eadbb13b463395b49fe /xfa/fxfa | |
| parent | 82aa396188ec26f22fe730f4e35b5a54ebffb5dc (diff) | |
| download | pdfium-c757d9a6f90bb879ce2cdd4a756b7b0e1885eb25.tar.xz | |
Remove some |void Release() { delete this; }| anti-pattern.
m_pSyntaxParser was unused.
Review-Url: https://codereview.chromium.org/2646203002
Diffstat (limited to 'xfa/fxfa')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 8 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_simple_parser.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_xml_parser.h | 3 |
3 files changed, 5 insertions, 8 deletions
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; |