Bug 1372061 - Shuffle some fields around to avoid bindgen issues. r=emilio

MozReview-Commit-ID: IMzcnJRtGJi
This commit is contained in:
Cameron McCormack 2017-06-29 22:39:31 -07:00
Родитель 8f144f6221
Коммит 09fa89b60e
1 изменённых файлов: 9 добавлений и 7 удалений

Просмотреть файл

@ -40,8 +40,8 @@ public:
: mParent(aParent),
mChild(nullptr),
mDefaultChild(nullptr),
mIndexInInserted(0),
mIsFirst(aStartAtBeginning)
mIsFirst(aStartAtBeginning),
mIndexInInserted(0)
{
}
@ -51,13 +51,15 @@ public:
mShadowIterator(aOther.mShadowIterator ?
new ExplicitChildIterator(*aOther.mShadowIterator) :
nullptr),
mIndexInInserted(aOther.mIndexInInserted), mIsFirst(aOther.mIsFirst) {}
mIsFirst(aOther.mIsFirst),
mIndexInInserted(aOther.mIndexInInserted) {}
ExplicitChildIterator(ExplicitChildIterator&& aOther)
: mParent(aOther.mParent), mChild(aOther.mChild),
mDefaultChild(aOther.mDefaultChild),
mShadowIterator(Move(aOther.mShadowIterator)),
mIndexInInserted(aOther.mIndexInInserted), mIsFirst(aOther.mIsFirst) {}
mIsFirst(aOther.mIsFirst),
mIndexInInserted(aOther.mIndexInInserted) {}
nsIContent* GetNextChild();
@ -119,14 +121,14 @@ protected:
// iterating.
nsAutoPtr<ExplicitChildIterator> mShadowIterator;
// A flag to let us know that we haven't started iterating yet.
bool mIsFirst;
// If not zero, we're iterating inserted children for an insertion point. This
// is an index into mChild's inserted children array (mChild must be an
// nsXBLChildrenElement). The index is one past the "current" child (as
// opposed to mChild which represents the "current" child).
uint32_t mIndexInInserted;
// A flag to let us know that we haven't started iterating yet.
bool mIsFirst;
};
// Iterates over the flattened children of a node, which accounts for anonymous