Bug 376533 - "uClibc strings/index and childiterator.index conficts" [r=dbaron]
authorromaxa <romaxa@gmail.com>
Wed, 20 Aug 2008 01:15:26 -0500
changeset 17132 e44f43f9aca0409224bef5f765505bbc4f647cf8
parent 17131 fc3a6529896eac69b54807da8fbef0d38f3a59e1
child 17133 83f4ff468cca7056f592e9085a6f5d711415b23e
push idunknown
push userunknown
push dateunknown
reviewersdbaron
bugs376533
milestone1.9.1a2pre
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
layout/base/nsCSSFrameConstructor.cpp
layout/base/nsChildIterator.h
--- 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;