Bug 376533 - "uClibc strings/index and childiterator.index conficts" [r=dbaron]
Index: mozilla/layout/base/nsCSSFrameConstructor.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/base/nsCSSFrameConstructor.cpp,v
retrieving revision 1.1453
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -8341,17 +8341,17 @@ nsCSSFrameConstructor::ContentAppended(n
for (ChildIterator::Init(insertionContent, &iter, &last);
iter != last;
++iter) {
LAYOUT_PHASE_TEMP_EXIT();
nsIContent* item = nsCOMPtr<nsIContent>(*iter);
if (item == child)
// Call ContentInserted with this index.
ContentInserted(aContainer, child,
- iter.index(), mTempFrameTreeState);
+ iter.position(), mTempFrameTreeState);
LAYOUT_PHASE_TEMP_REENTER();
}
}
return NS_OK;
}
}
--- a/layout/base/nsChildIterator.h
+++ b/layout/base/nsChildIterator.h
@@ -116,17 +116,17 @@ public:
PRBool operator==(const ChildIterator& aOther) const {
return mContent == aOther.mContent && mIndex == aOther.mIndex;
}
PRBool operator!=(const ChildIterator& aOther) const {
return !aOther.operator==(*this);
}
- PRUint32 index() {
+ PRUint32 position() {
return mIndex;
}
void seek(PRUint32 aIndex) {
// Make sure that aIndex is reasonable. This should be |#ifdef
// DEBUG|, but we need these numbers for the temporary workaround
// for bug 133219.
PRUint32 length;