Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1794456 Part 4 - Remove unused nsFrameList::Enumerator. r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D158987
This commit is contained in:
Ting-Yu Lin 2022-10-11 21:01:28 +00:00
parent 8bbc0dbcf5
commit 3bb8ea5ca6
2 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
layout/generic/nsFrameList.h
View File

@ -362,17 +362,13 @@ class nsFrameList {
static inline const nsFrameList& EmptyList();
class Enumerator;
/**
* A class representing a slice of a frame list.
*/
class Slice {
friend class Enumerator;
public:
// Implicit on purpose, so that we can easily create enumerators from
// nsFrameList via this impicit constructor.
// Implicit on purpose, so that we can easily create Slice from nsFrameList
// via this impicit constructor.
MOZ_IMPLICIT Slice(const nsFrameList& aList)
: mStart(aList.FirstChild()), mEnd(nullptr) {}
Slice(nsIFrame* aStart, nsIFrame* aEnd) : mStart(aStart), mEnd(aEnd) {}
@ -390,51 +386,6 @@ class nsFrameList {
nsIFrame* const mEnd;
};
class Enumerator {
public:
explicit Enumerator(const Slice& aSlice)
: mFrame(aSlice.mStart), mEnd(aSlice.mEnd) {}
Enumerator(const Enumerator& aOther) = default;
bool AtEnd() const {
// Can't just check mEnd, because some table code goes and destroys the
// tail of the frame list (including mEnd!) while iterating over the
// frame list.
return !mFrame || mFrame == mEnd;
}
/* Next() needs to know about nsIFrame, and nsIFrame will need to
know about nsFrameList methods, so in order to inline this put
the implementation in nsIFrame.h */
inline void Next();
/**
* Get the current frame we're pointing to. Do not call this on an
* iterator that is at end!
*/
nsIFrame* get() const {
MOZ_ASSERT(!AtEnd(), "Enumerator is at end");
return mFrame;
}
/**
* Get an enumerator that is just like this one, but not limited in terms of
* the part of the list it will traverse.
*/
Enumerator GetUnlimitedEnumerator() const {
return Enumerator(*this, nullptr);
}
protected:
Enumerator(const Enumerator& aOther, const nsIFrame* const aNewEnd)
: mFrame(aOther.mFrame), mEnd(aNewEnd) {}
nsIFrame* mFrame; // our current frame.
const nsIFrame* const mEnd; // The first frame we should NOT enumerate.
// May be null.
};
template <typename FrameTraversal>
class Iterator final {
public:

5
layout/generic/nsIFrame.h
View File

@ -5725,11 +5725,6 @@ inline bool nsFrameList::StartRemoveFrame(nsIFrame* aFrame) {
return ContinueRemoveFrame(aFrame);
}
inline void nsFrameList::Enumerator::Next() {
NS_ASSERTION(!AtEnd(), "Should have checked AtEnd()!");
mFrame = mFrame->GetNextSibling();
}
// Operators of nsFrameList::Iterator
// ---------------------------------------------------