Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 5141. The parentNode of a standalone Node is no longer a DocumentFragment, but is now, according to the spec, just null.

Browse Source
This commit is contained in:
vidur%netscape.com 1999-04-17 00:56:25 +00:00
parent 7ec75c37fa
commit 632fa812dc
4 changed files with 32 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
content/base/src/nsGenericDOMDataNode.cpp
View File

@ -95,43 +95,23 @@ nsGenericDOMDataNode::SetNodeValue(const nsString& aNodeValue)
nsresult
nsGenericDOMDataNode::GetParentNode(nsIDOMNode** aParentNode)
{
nsresult res = NS_OK;
if (nsnull != mParent) {
nsresult res = mParent->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
res = mParent->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
NS_ASSERTION(NS_OK == res, "Must be a DOM Node");
return res;
}
else if (nsnull == mDocument) {
// A standalone node (i.e. one without a parent or a document)
// implicitly has a document fragment as its parent according to
// the DOM.
nsIDOMDocumentFragment* docFrag;
nsIDOMNode *node, *ret;
// XXX If we don't have a document, how do we give the document
// fragment an owner document?
nsresult res = NS_NewDocumentFragment(&docFrag, nsnull);
if (NS_OK != res) {
return res;
}
res = mContent->QueryInterface(kIDOMNodeIID, (void**)&node);
if (NS_OK != res) {
return res;
}
res = docFrag->AppendChild(node, &ret);
NS_RELEASE(node);
if (NS_OK != res) {
return res;
}
NS_RELEASE(ret);
res = docFrag->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
NS_RELEASE(docFrag);
return res;
*aParentNode = nsnull;
}
else {
// If we don't have a parent, but we're in the document, we must
// be at the top level. The DOM says that the root is the document.
return mDocument->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
// be the root node of the document. The DOM says that the root
// is the document.
res = mDocument->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
}
return NS_OK;
return res;
}
nsresult

34
content/base/src/nsGenericElement.cpp
View File

@ -253,43 +253,23 @@ nsGenericElement::GetNodeType(PRUint16* aNodeType)
nsresult
nsGenericElement::GetParentNode(nsIDOMNode** aParentNode)
{
nsresult res = NS_OK;
if (nsnull != mParent) {
nsresult res = mParent->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
res = mParent->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
NS_ASSERTION(NS_OK == res, "Must be a DOM Node");
return res;
}
else if (nsnull == mDocument) {
// A standalone element (i.e. one without a parent or a document)
// implicitly has a document fragment as its parent according to
// the DOM.
nsIDOMDocumentFragment* docFrag;
nsIDOMNode *node, *ret;
// XXX If we don't have a document, how do we give the document
// fragment an owner document?
nsresult res = NS_NewDocumentFragment(&docFrag, nsnull);
if (NS_OK != res) {
return res;
}
res = mContent->QueryInterface(kIDOMNodeIID, (void**)&node);
if (NS_OK != res) {
return res;
}
res = docFrag->AppendChild(node, &ret);
NS_RELEASE(node);
if (NS_OK != res) {
return res;
}
NS_RELEASE(ret);
res = docFrag->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
NS_RELEASE(docFrag);
return res;
*aParentNode = nsnull;
}
else {
// If we don't have a parent, but we're in the document, we must
// be the root node of the document. The DOM says that the root
// is the document.
return mDocument->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
res = mDocument->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
}
return res;
}
nsresult

38
layout/base/src/nsGenericDOMDataNode.cpp
View File

@ -95,43 +95,23 @@ nsGenericDOMDataNode::SetNodeValue(const nsString& aNodeValue)
nsresult
nsGenericDOMDataNode::GetParentNode(nsIDOMNode** aParentNode)
{
nsresult res = NS_OK;
if (nsnull != mParent) {
nsresult res = mParent->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
res = mParent->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
NS_ASSERTION(NS_OK == res, "Must be a DOM Node");
return res;
}
else if (nsnull == mDocument) {
// A standalone node (i.e. one without a parent or a document)
// implicitly has a document fragment as its parent according to
// the DOM.
nsIDOMDocumentFragment* docFrag;
nsIDOMNode *node, *ret;
// XXX If we don't have a document, how do we give the document
// fragment an owner document?
nsresult res = NS_NewDocumentFragment(&docFrag, nsnull);
if (NS_OK != res) {
return res;
}
res = mContent->QueryInterface(kIDOMNodeIID, (void**)&node);
if (NS_OK != res) {
return res;
}
res = docFrag->AppendChild(node, &ret);
NS_RELEASE(node);
if (NS_OK != res) {
return res;
}
NS_RELEASE(ret);
res = docFrag->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
NS_RELEASE(docFrag);
return res;
*aParentNode = nsnull;
}
else {
// If we don't have a parent, but we're in the document, we must
// be at the top level. The DOM says that the root is the document.
return mDocument->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
// be the root node of the document. The DOM says that the root
// is the document.
res = mDocument->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
}
return NS_OK;
return res;
}
nsresult

34
layout/base/src/nsGenericElement.cpp
View File

@ -253,43 +253,23 @@ nsGenericElement::GetNodeType(PRUint16* aNodeType)
nsresult
nsGenericElement::GetParentNode(nsIDOMNode** aParentNode)
{
nsresult res = NS_OK;
if (nsnull != mParent) {
nsresult res = mParent->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
res = mParent->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
NS_ASSERTION(NS_OK == res, "Must be a DOM Node");
return res;
}
else if (nsnull == mDocument) {
// A standalone element (i.e. one without a parent or a document)
// implicitly has a document fragment as its parent according to
// the DOM.
nsIDOMDocumentFragment* docFrag;
nsIDOMNode *node, *ret;
// XXX If we don't have a document, how do we give the document
// fragment an owner document?
nsresult res = NS_NewDocumentFragment(&docFrag, nsnull);
if (NS_OK != res) {
return res;
}
res = mContent->QueryInterface(kIDOMNodeIID, (void**)&node);
if (NS_OK != res) {
return res;
}
res = docFrag->AppendChild(node, &ret);
NS_RELEASE(node);
if (NS_OK != res) {
return res;
}
NS_RELEASE(ret);
res = docFrag->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
NS_RELEASE(docFrag);
return res;
*aParentNode = nsnull;
}
else {
// If we don't have a parent, but we're in the document, we must
// be the root node of the document. The DOM says that the root
// is the document.
return mDocument->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
res = mDocument->QueryInterface(kIDOMNodeIID, (void**)aParentNode);
}
return res;
}
nsresult