wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 433662 part 1 - Clean up nsRange::InsertNode; r=smaug

Browse Source
This commit is contained in:
Aryeh Gregor 2012-04-01 07:50:31 -04:00
parent 74e3fe855d
commit 542f4bb6ec
1 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
content/base/src/nsRange.cpp
View File

@ -2099,9 +2099,9 @@ nsRange::CloneRange(nsIDOMRange** aReturn)
}
NS_IMETHODIMP
nsRange::InsertNode(nsIDOMNode* aN)
nsRange::InsertNode(nsIDOMNode* aNode)
{
VALIDATE_ACCESS(aN);
VALIDATE_ACCESS(aNode);
nsresult res;
PRInt32 tStartOffset;
@ -2109,51 +2109,35 @@ nsRange::InsertNode(nsIDOMNode* aN)
nsCOMPtr<nsIDOMNode> tStartContainer;
res = this->GetStartContainer(getter_AddRefs(tStartContainer));
if(NS_FAILED(res)) return res;
NS_ENSURE_SUCCESS(res, res);
// This is the node we'll be inserting before, and its parent
nsCOMPtr<nsIDOMNode> referenceNode;
nsCOMPtr<nsIDOMNode> referenceParentNode = tStartContainer;
nsCOMPtr<nsIDOMText> startTextNode(do_QueryInterface(tStartContainer));
if (startTextNode)
{
nsCOMPtr<nsIDOMNode> tSCParentNode;
res = tStartContainer->GetParentNode(getter_AddRefs(tSCParentNode));
if(NS_FAILED(res)) return res;
NS_ENSURE_TRUE(tSCParentNode, NS_ERROR_DOM_HIERARCHY_REQUEST_ERR);
PRInt32 tEndOffset;
GetEndOffset(&tEndOffset);
nsCOMPtr<nsIDOMNode> tEndContainer;
res = this->GetEndContainer(getter_AddRefs(tEndContainer));
if(NS_FAILED(res)) return res;
if (startTextNode) {
res = tStartContainer->GetParentNode(getter_AddRefs(referenceParentNode));
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_TRUE(referenceParentNode, NS_ERROR_DOM_HIERARCHY_REQUEST_ERR);
nsCOMPtr<nsIDOMText> secondPart;
res = startTextNode->SplitText(tStartOffset, getter_AddRefs(secondPart));
if (NS_FAILED(res)) return res;
NS_ENSURE_SUCCESS(res, res);
nsCOMPtr<nsIDOMNode> tResultNode;
res = tSCParentNode->InsertBefore(aN, secondPart, getter_AddRefs(tResultNode));
if (NS_FAILED(res)) return res;
referenceNode = secondPart;
} else {
nsCOMPtr<nsIDOMNodeList>tChildList;
res = tStartContainer->GetChildNodes(getter_AddRefs(tChildList));
NS_ENSURE_SUCCESS(res, res);
if (tEndContainer == tStartContainer && tEndOffset != tStartOffset)
res = SetEnd(secondPart, tEndOffset - tStartOffset);
return res;
}
nsCOMPtr<nsIDOMNodeList>tChildList;
res = tStartContainer->GetChildNodes(getter_AddRefs(tChildList));
if(NS_FAILED(res)) return res;
PRUint32 tChildListLength;
res = tChildList->GetLength(&tChildListLength);
if(NS_FAILED(res)) return res;
// find the insertion point in the DOM and insert the Node
nsCOMPtr<nsIDOMNode>tChildNode;
res = tChildList->Item(tStartOffset, getter_AddRefs(tChildNode));
if(NS_FAILED(res)) return res;
// find the insertion point in the DOM and insert the Node
res = tChildList->Item(tStartOffset, getter_AddRefs(referenceNode));
NS_ENSURE_SUCCESS(res, res);
}
nsCOMPtr<nsIDOMNode> tResultNode;
return tStartContainer->InsertBefore(aN, tChildNode, getter_AddRefs(tResultNode));
return referenceParentNode->InsertBefore(aNode, referenceNode, getter_AddRefs(tResultNode));
}
NS_IMETHODIMP