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

bug 403280. convert nsLayoutUtils::DoCompareTreePosition from an nsAutoVoidArray to a larger nsAutoTArray convert nsContentUtils::ComparePoints from an nsTArray to an nsAutoTArray r/sr/a=sicking

Browse Source
This commit is contained in:
pavlov@pavlov.net 2007-11-11 12:35:30 -08:00
parent 12549d2ffd
commit 5136dde36e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/src/nsContentUtils.cpp
View File

@ -1292,7 +1292,7 @@ nsContentUtils::ComparePosition(nsINode* aNode1,
return 0;
}
nsAutoTPtrArray<nsINode, 30> parents1, parents2;
nsAutoTPtrArray<nsINode, 32> parents1, parents2;
// Check if either node is an attribute
nsIAttribute* attr1 = nsnull;
@ -1405,7 +1405,7 @@ nsContentUtils::ComparePoints(nsINode* aParent1, PRInt32 aOffset1,
0;
}
nsTArray<nsINode*> parents1, parents2;
nsAutoTArray<nsINode*, 32> parents1, parents2;
nsINode* node1 = aParent1;
nsINode* node2 = aParent2;
do {

12
layout/base/nsLayoutUtils.cpp
View File

@ -305,7 +305,7 @@ nsLayoutUtils::DoCompareTreePosition(nsIContent* aContent1,
NS_PRECONDITION(aContent1, "aContent1 must not be null");
NS_PRECONDITION(aContent2, "aContent2 must not be null");
nsAutoVoidArray content1Ancestors;
nsAutoTArray<nsINode*, 32> content1Ancestors;
nsINode* c1;
for (c1 = aContent1; c1 && c1 != aCommonAncestor; c1 = c1->GetNodeParent()) {
content1Ancestors.AppendElement(c1);
@ -316,7 +316,7 @@ nsLayoutUtils::DoCompareTreePosition(nsIContent* aContent1,
aCommonAncestor = nsnull;
}
nsAutoVoidArray content2Ancestors;
nsAutoTArray<nsINode*, 32> content2Ancestors;
nsINode* c2;
for (c2 = aContent2; c2 && c2 != aCommonAncestor; c2 = c2->GetNodeParent()) {
content2Ancestors.AppendElement(c2);
@ -328,13 +328,13 @@ nsLayoutUtils::DoCompareTreePosition(nsIContent* aContent1,
aIf1Ancestor, aIf2Ancestor, nsnull);
}
int last1 = content1Ancestors.Count() - 1;
int last2 = content2Ancestors.Count() - 1;
int last1 = content1Ancestors.Length() - 1;
int last2 = content2Ancestors.Length() - 1;
nsINode* content1Ancestor = nsnull;
nsINode* content2Ancestor = nsnull;
while (last1 >= 0 && last2 >= 0
&& ((content1Ancestor = static_cast<nsINode*>(content1Ancestors.ElementAt(last1)))
== (content2Ancestor = static_cast<nsINode*>(content2Ancestors.ElementAt(last2))))) {
&& ((content1Ancestor = content1Ancestors.ElementAt(last1)) ==
(content2Ancestor = content2Ancestors.ElementAt(last2)))) {
last1--;
last2--;
}