Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for 83743 nsRange::SurroundCOntents() not all paths return value

Browse Source 
r=mjudge@netscape.com
sr=kin@netscape.com
a=asa@mozilla.org
This commit is contained in:
anthonyd%netscape.com 2001-06-15 18:15:09 +00:00
parent b3316bc83e
commit 8a54dca00b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1794,6 +1794,8 @@ nsresult nsRange::SurroundContents(nsIDOMNode* aN)
{
if(IsDetached())
return NS_ERROR_DOM_INVALID_STATE_ERR;
NS_ENSURE_ARG_POINTER(aN);
nsresult res;
//get start offset, and start container
@ -1810,6 +1812,7 @@ nsresult nsRange::SurroundContents(nsIDOMNode* aN)
res = GetEndContainer(getter_AddRefs(tEndContainer));
if(NS_FAILED(res)) return res;
//prep start
PRUint16 tStartNodeType;
tStartContainer->GetNodeType(&tStartNodeType);
if( (nsIDOMNode::CDATA_SECTION_NODE == tStartNodeType) ||
@ -1823,6 +1826,7 @@ nsresult nsRange::SurroundContents(nsIDOMNode* aN)
tStartContainer = do_QueryInterface(tTempText);
}
//prep end
PRUint16 tEndNodeType;
tEndContainer->GetNodeType(&tEndNodeType);
if( (nsIDOMNode::CDATA_SECTION_NODE == tEndNodeType) ||
@ -1836,6 +1840,7 @@ nsresult nsRange::SurroundContents(nsIDOMNode* aN)
tEndContainer = do_QueryInterface(tTempText);
}
//get ancestor info
nsCOMPtr<nsIDOMNode> tAncestorContainer;
this->GetCommonAncestorContainer(getter_AddRefs(tAncestorContainer));
@ -1847,21 +1852,25 @@ nsresult nsRange::SurroundContents(nsIDOMNode* aN)
nsCOMPtr<nsIDOMDocument> document;
res = mStartParent->GetOwnerDocument(getter_AddRefs(document));
if (NS_FAILED(res)) return res;
// Create a new document fragment in the context of this document
nsCOMPtr<nsIDOMDocumentFragment> docfrag;
res = document->CreateDocumentFragment(getter_AddRefs(docfrag));
if (NS_FAILED(res)) return res;
this->ExtractContents(getter_AddRefs(docfrag));
res = this->ExtractContents(getter_AddRefs(docfrag));
if (NS_FAILED(res)) return res;
tRangeContentsNode = do_QueryInterface(docfrag);
aN->AppendChild(tRangeContentsNode, getter_AddRefs(tempNode));
if( (nsIDOMNode::CDATA_SECTION_NODE == tCommonAncestorType) ||
(nsIDOMNode::TEXT_NODE == tCommonAncestorType) )
{
{//easy stuff here
this->InsertNode(aN);
}
else
{
{//hard stuff here
nsCOMPtr<nsIDOMNodeList>tChildList;
res = tAncestorContainer->GetChildNodes(getter_AddRefs(tChildList));
PRUint32 i,tNumChildren;
@ -1908,6 +1917,8 @@ nsresult nsRange::SurroundContents(nsIDOMNode* aN)
}
this->DoSetRange(tStartContainer, 0, tEndContainer, tEndOffset);
}
this->SelectNode(aN);
return NS_OK;
}
nsresult nsRange::ToString(nsAWritableString& aReturn)