Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 337543: Use nsINode more. r/sr+peterv

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@197985 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cvshook%sicking.cc
2006-05-19 10:01:22 +00:00
parent a4a6d0ff40
commit e96a4f70c3
12 changed files with 291 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
mozilla/content/base/src/nsGenericDOMDataNode.cpp
View File

@@ -133,88 +133,42 @@ nsGenericDOMDataNode::SetNodeValue(const nsAString& aNodeValue)
nsresult
nsGenericDOMDataNode::GetParentNode(nsIDOMNode** aParentNode)
{
nsresult rv = NS_OK;
*aParentNode = nsnull;
nsINode *parent = GetNodeParent();
nsIContent *parent = GetParent();
if (parent) {
rv = CallQueryInterface(parent, aParentNode);
}
else if (IsInDoc()) {
rv = CallQueryInterface(GetCurrentDoc(), aParentNode);
}
else {
*aParentNode = nsnull;
}
NS_ASSERTION(NS_SUCCEEDED(rv), "Must be a DOM Node");
return rv;
return parent ? CallQueryInterface(parent, aParentNode) : NS_OK;
}
nsresult
nsGenericDOMDataNode::GetPreviousSibling(nsIDOMNode** aPrevSibling)
{
nsresult rv = NS_OK;
*aPrevSibling = nsnull;
nsIContent *sibling = nsnull;
nsIContent *parent = GetParent();
if (parent) {
PRInt32 pos = parent->IndexOf(this);
if (pos > 0) {
sibling = parent->GetChildAt(pos - 1);
}
}
else {
nsIDocument *doc = GetCurrentDoc();
if (doc) {
PRInt32 pos = doc->IndexOf(this);
if (pos > 0) {
sibling = doc->GetChildAt(pos - 1);
}
}
nsINode *parent = GetNodeParent();
if (!parent) {
return NS_OK;
}
if (sibling) {
rv = CallQueryInterface(sibling, aPrevSibling);
NS_ASSERTION(NS_SUCCEEDED(rv), "Must be a DOM Node");
} else {
*aPrevSibling = nsnull;
}
PRInt32 pos = parent->IndexOf(this);
nsIContent *sibling = parent->GetChildAt(pos - 1);
return rv;
return sibling ? CallQueryInterface(sibling, aPrevSibling) : NS_OK;
}
nsresult
nsGenericDOMDataNode::GetNextSibling(nsIDOMNode** aNextSibling)
{
nsresult rv = NS_OK;
*aNextSibling = nsnull;
nsIContent *sibling = nsnull;
nsIContent *parent = GetParent();
if (parent) {
PRInt32 pos = parent->IndexOf(this);
if (pos > -1) {
sibling = parent->GetChildAt(pos + 1);
}
}
else {
nsIDocument *doc = GetCurrentDoc();
if (doc) {
PRInt32 pos = doc->IndexOf(this);
if (pos > -1) {
sibling = doc->GetChildAt(pos + 1);
}
}
nsINode *parent = GetNodeParent();
if (!parent) {
return NS_OK;
}
if (sibling) {
rv = CallQueryInterface(sibling, aNextSibling);
NS_ASSERTION(NS_SUCCEEDED(rv), "Must be a DOM Node");
} else {
*aNextSibling = nsnull;
}
PRInt32 pos = parent->IndexOf(this);
nsIContent *sibling = parent->GetChildAt(pos + 1);
return rv;
return sibling ? CallQueryInterface(sibling, aNextSibling) : NS_OK;
}
nsresult
@@ -622,15 +576,16 @@ nsGenericDOMDataNode::GetSCCIndex()
{
// This is an optimized way of walking nsIDOMNode::GetParentNode to
// the top of the tree.
nsIDOMGCParticipant *result = GetCurrentDoc();
if (!result) {
nsIContent *top = this;
while (top->GetParent())
top = top->GetParent();
result = top;
nsINode *top = GetCurrentDoc();
if (!top) {
top = this;
nsINode *parent;
while ((parent = top->GetNodeParent())) {
top = parent;
}
}
return result;
return top;
}
void