Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-08 16:03:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add some more nsCOMPtrs to fix leakage.

Browse Source
This commit is contained in:
rjc%netscape.com 1999-04-28 07:03:11 +00:00
parent 1e25c4063c
commit 8315e6fde0
2 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
content/xul/templates/src/nsXULSortService.cpp
View File

@ -748,8 +748,8 @@ getNodeValue(nsIContent *node1, nsIRDFResource *sortProperty, sortPtr sortInfo,
}
else
{
nsIContent *cell1 = nsnull;
if (NS_SUCCEEDED(rv = GetTreeCell(sortInfo, node1, sortInfo->colIndex, &cell1)))
nsCOMPtr<nsIContent> cell1;
if (NS_SUCCEEDED(rv = GetTreeCell(sortInfo, node1, sortInfo->colIndex, getter_AddRefs(cell1))))
{
if (cell1)
{
@ -962,13 +962,13 @@ XULSortServiceImpl::OpenContainer(nsIRDFCompositeDataSource *db, nsIContent *con
nsIRDFResource **flatArray, PRInt32 numElements, PRInt32 elementSize)
{
nsresult rv;
nsIContent *treeNode;
nsString sortResource, sortDirection;
_sortStruct sortInfo;
// get sorting info (property to sort on, direction to sort, etc)
if (NS_FAILED(rv = FindTreeElement(container, &treeNode))) return(rv);
nsCOMPtr<nsIContent> treeNode;
if (NS_FAILED(rv = FindTreeElement(container, getter_AddRefs(treeNode)))) return(rv);
sortInfo.rdfService = gRDFService;
sortInfo.db = db;
@ -1009,13 +1009,13 @@ NS_IMETHODIMP
XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node)
{
nsresult rv;
nsIContent *treeNode;
nsString sortResource, sortDirection;
_sortStruct sortInfo;
// get sorting info (property to sort on, direction to sort, etc)
if (NS_FAILED(rv = FindTreeElement(container, &treeNode))) return(rv);
nsCOMPtr<nsIContent> treeNode;
if (NS_FAILED(rv = FindTreeElement(container, getter_AddRefs(treeNode)))) return(rv);
// get composite db for tree
nsIDOMXULTreeElement *domXulTree;
@ -1178,23 +1178,24 @@ XULSortServiceImpl::DoSort(nsIDOMNode* node, const nsString& sortResource,
const nsString& sortDirection)
{
PRInt32 colIndex, treeBodyIndex;
nsIContent *contentNode, *treeNode, *treeBody, *treeParent;
nsresult rv;
_sortStruct sortInfo;
// get tree node
if (NS_FAILED(rv = node->QueryInterface(kIContentIID, (void**)&contentNode))) return(rv);
if (NS_FAILED(rv = FindTreeElement(contentNode, &treeNode))) return(rv);
nsCOMPtr<nsIContent> contentNode = do_QueryInterface(node);
if (!contentNode) return(NS_ERROR_FAILURE);
nsCOMPtr<nsIContent> treeNode;
if (NS_FAILED(rv = FindTreeElement(contentNode, getter_AddRefs(treeNode)))) return(rv);
// get composite db for tree
nsIDOMXULTreeElement *domXulTree;
sortInfo.rdfService = gRDFService;
sortInfo.db = nsnull;
if (NS_SUCCEEDED(rv = treeNode->QueryInterface(kIDomXulTreeElementIID, (void**)&domXulTree)))
nsCOMPtr<nsIDOMXULTreeElement> domXulTree = do_QueryInterface(treeNode);
if (!domXulTree) return(NS_ERROR_FAILURE);
nsCOMPtr<nsIRDFCompositeDataSource> cds;
if (NS_SUCCEEDED(rv = domXulTree->GetDatabase(getter_AddRefs(cds))))
{
if (NS_SUCCEEDED(rv = domXulTree->GetDatabase(&sortInfo.db)))
{
}
sortInfo.db = cds;
}
sortInfo.kNaturalOrderPosAtom = kNaturalOrderPosAtom;
@ -1227,13 +1228,15 @@ XULSortServiceImpl::DoSort(nsIDOMNode* node, const nsString& sortResource,
// reflows...
if (NS_FAILED(rv = GetSortColumnIndex(treeNode, sortResource, sortDirection, &colIndex))) return(rv);
sortInfo.colIndex = colIndex;
if (NS_FAILED(rv = FindTreeBodyElement(treeNode, &treeBody))) return(rv);
nsCOMPtr<nsIContent> treeBody;
if (NS_FAILED(rv = FindTreeBodyElement(treeNode, getter_AddRefs(treeBody)))) return(rv);
if (NS_SUCCEEDED(rv = SortTreeChildren(treeBody, colIndex, &sortInfo, 0)))
{
}
// Now remove the treebody and re-insert it to force the frames to be rebuilt.
if (NS_FAILED(rv = treeBody->GetParent(treeParent))) return(rv);
nsCOMPtr<nsIContent> treeParent;
if (NS_FAILED(rv = treeBody->GetParent(*getter_AddRefs(treeParent)))) return(rv);
if (NS_FAILED(rv = treeParent->IndexOf(treeBody, treeBodyIndex))) return(rv);
if (NS_FAILED(rv = treeParent->RemoveChildAt(treeBodyIndex, PR_TRUE))) return(rv);

35
rdf/content/src/nsXULSortService.cpp
View File

@ -748,8 +748,8 @@ getNodeValue(nsIContent *node1, nsIRDFResource *sortProperty, sortPtr sortInfo,
}
else
{
nsIContent *cell1 = nsnull;
if (NS_SUCCEEDED(rv = GetTreeCell(sortInfo, node1, sortInfo->colIndex, &cell1)))
nsCOMPtr<nsIContent> cell1;
if (NS_SUCCEEDED(rv = GetTreeCell(sortInfo, node1, sortInfo->colIndex, getter_AddRefs(cell1))))
{
if (cell1)
{
@ -962,13 +962,13 @@ XULSortServiceImpl::OpenContainer(nsIRDFCompositeDataSource *db, nsIContent *con
nsIRDFResource **flatArray, PRInt32 numElements, PRInt32 elementSize)
{
nsresult rv;
nsIContent *treeNode;
nsString sortResource, sortDirection;
_sortStruct sortInfo;
// get sorting info (property to sort on, direction to sort, etc)
if (NS_FAILED(rv = FindTreeElement(container, &treeNode))) return(rv);
nsCOMPtr<nsIContent> treeNode;
if (NS_FAILED(rv = FindTreeElement(container, getter_AddRefs(treeNode)))) return(rv);
sortInfo.rdfService = gRDFService;
sortInfo.db = db;
@ -1009,13 +1009,13 @@ NS_IMETHODIMP
XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node)
{
nsresult rv;
nsIContent *treeNode;
nsString sortResource, sortDirection;
_sortStruct sortInfo;
// get sorting info (property to sort on, direction to sort, etc)
if (NS_FAILED(rv = FindTreeElement(container, &treeNode))) return(rv);
nsCOMPtr<nsIContent> treeNode;
if (NS_FAILED(rv = FindTreeElement(container, getter_AddRefs(treeNode)))) return(rv);
// get composite db for tree
nsIDOMXULTreeElement *domXulTree;
@ -1178,23 +1178,24 @@ XULSortServiceImpl::DoSort(nsIDOMNode* node, const nsString& sortResource,
const nsString& sortDirection)
{
PRInt32 colIndex, treeBodyIndex;
nsIContent *contentNode, *treeNode, *treeBody, *treeParent;
nsresult rv;
_sortStruct sortInfo;
// get tree node
if (NS_FAILED(rv = node->QueryInterface(kIContentIID, (void**)&contentNode))) return(rv);
if (NS_FAILED(rv = FindTreeElement(contentNode, &treeNode))) return(rv);
nsCOMPtr<nsIContent> contentNode = do_QueryInterface(node);
if (!contentNode) return(NS_ERROR_FAILURE);
nsCOMPtr<nsIContent> treeNode;
if (NS_FAILED(rv = FindTreeElement(contentNode, getter_AddRefs(treeNode)))) return(rv);
// get composite db for tree
nsIDOMXULTreeElement *domXulTree;
sortInfo.rdfService = gRDFService;
sortInfo.db = nsnull;
if (NS_SUCCEEDED(rv = treeNode->QueryInterface(kIDomXulTreeElementIID, (void**)&domXulTree)))
nsCOMPtr<nsIDOMXULTreeElement> domXulTree = do_QueryInterface(treeNode);
if (!domXulTree) return(NS_ERROR_FAILURE);
nsCOMPtr<nsIRDFCompositeDataSource> cds;
if (NS_SUCCEEDED(rv = domXulTree->GetDatabase(getter_AddRefs(cds))))
{
if (NS_SUCCEEDED(rv = domXulTree->GetDatabase(&sortInfo.db)))
{
}
sortInfo.db = cds;
}
sortInfo.kNaturalOrderPosAtom = kNaturalOrderPosAtom;
@ -1227,13 +1228,15 @@ XULSortServiceImpl::DoSort(nsIDOMNode* node, const nsString& sortResource,
// reflows...
if (NS_FAILED(rv = GetSortColumnIndex(treeNode, sortResource, sortDirection, &colIndex))) return(rv);
sortInfo.colIndex = colIndex;
if (NS_FAILED(rv = FindTreeBodyElement(treeNode, &treeBody))) return(rv);
nsCOMPtr<nsIContent> treeBody;
if (NS_FAILED(rv = FindTreeBodyElement(treeNode, getter_AddRefs(treeBody)))) return(rv);
if (NS_SUCCEEDED(rv = SortTreeChildren(treeBody, colIndex, &sortInfo, 0)))
{
}
// Now remove the treebody and re-insert it to force the frames to be rebuilt.
if (NS_FAILED(rv = treeBody->GetParent(treeParent))) return(rv);
nsCOMPtr<nsIContent> treeParent;
if (NS_FAILED(rv = treeBody->GetParent(*getter_AddRefs(treeParent)))) return(rv);
if (NS_FAILED(rv = treeParent->IndexOf(treeBody, treeBodyIndex))) return(rv);
if (NS_FAILED(rv = treeParent->RemoveChildAt(treeBodyIndex, PR_TRUE))) return(rv);