summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cxfa_document.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-20 20:27:43 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-20 20:27:43 +0000
commit68c77592f25f9173d2166fa01fb34b4155f4cfcb (patch)
treeced2e1308f8b1e6b4c0934dc5f3b1c697223de61 /xfa/fxfa/parser/cxfa_document.cpp
parentfae5e26d983848089e35e2b53e9da24036661b08 (diff)
downloadpdfium-68c77592f25f9173d2166fa01fb34b4155f4cfcb.tar.xz
Remove {Set|Get|Try}Object methods
The CJX_Node::{Set|Get|Try}Object methods are used to set CXFA_WidgetData and CXFA_Node objects into the CJX_Node. This is stored in the node as void* data and custom delete methods are passed when needed. Instead, this CL just stores the two types of things we need on the CJX_Node and returns the correct types. This uses a bit more space on the CJX_Node, but it makes the code a lot clearer and simpler. Change-Id: I8546ea6456a1c1f5f8b602a6a420a0e85f3fac29 Reviewed-on: https://pdfium-review.googlesource.com/18570 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_document.cpp')
-rw-r--r--xfa/fxfa/parser/cxfa_document.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index 44fc9089c1..edae6c3837 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -94,6 +94,10 @@ CXFA_Document::CXFA_Document(CXFA_DocumentParser* pParser)
}
CXFA_Document::~CXFA_Document() {
+ // Remove all the bindings before freeing the node as the ownership is wonky.
+ if (m_pRootNode)
+ m_pRootNode->ReleaseBindingNodes();
+
delete m_pRootNode;
PurgeNodes();
}