summaryrefslogtreecommitdiff
path: root/fxjs/xfa/cjx_object.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-02-13 20:55:03 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-02-13 20:55:03 +0000
commit80bf582f00adeefae67ae432b74c3b0609e7845e (patch)
tree18c88bc620fcded6fc39cdfe3a5b0ae04643424d /fxjs/xfa/cjx_object.cpp
parent566d0b9486f024f253d1c331866b04529c9a22b3 (diff)
downloadpdfium-80bf582f00adeefae67ae432b74c3b0609e7845e.tar.xz
Cleanup CXFA_Node ownership
Currently a CXFA_Node can be owned by the CXFA_Document root pointer, the CXFA_Document Purge list or as a child of another CXFA_Node. This makes it hard to know who currently owns what. This CL moves all ownership of nodes into a CXFA_NodeOwner class which CXFA_Document subclasses. The node owner always owns all nodes and is responsible for cleaning them up upon destruction. The destruction order is not guarenteed to be in tree order as nodes can be inserted and moved around the tree. Change-Id: I6b202b8e844999ba835093dcdd1a808938b6d9a8 Reviewed-on: https://pdfium-review.googlesource.com/26434 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_object.cpp')
-rw-r--r--fxjs/xfa/cjx_object.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index d663fcce70..50643ffc5b 100644
--- a/fxjs/xfa/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -1261,7 +1261,7 @@ void CJX_Object::Script_Attribute_String(CFXJSE_Value* pValue,
pHeadChild = pSibling;
}
- std::unique_ptr<CXFA_Node> pProtoForm(pProtoNode->CloneTemplateToForm(true));
+ CXFA_Node* pProtoForm = pProtoNode->CloneTemplateToForm(true);
pHeadChild = pProtoForm->GetFirstChild();
while (pHeadChild) {
CXFA_Node* pSibling = pHeadChild->GetNextSibling();
@@ -1269,8 +1269,8 @@ void CJX_Object::Script_Attribute_String(CFXJSE_Value* pValue,
ToNode(GetXFAObject())->InsertChild(pHeadChild, nullptr);
pHeadChild = pSibling;
}
-
- GetDocument()->RemovePurgeNode(pProtoForm.get());
+ GetDocument()->FreeOwnedNode(pProtoForm);
+ pProtoForm = nullptr;
}
void CJX_Object::Script_Attribute_BOOL(CFXJSE_Value* pValue,