author | Scott Johnson <sjohnson@mozilla.com> |
Tue, 19 Mar 2013 12:36:05 -0500 | |
changeset 125458 | 7ea4ad83da53c40c4f7cb89834f6dee064c26402 |
parent 125457 | d9aa9a732b06887a1e6c007db47bf3c4e4a98069 |
child 125459 | e23f5058335b6fdc4593ebde610f499c13c69790 |
push id | 24459 |
push user | emorley@mozilla.com |
push date | Wed, 20 Mar 2013 11:46:36 +0000 |
treeherder | mozilla-central@1d6fe70c79c5 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mats |
bugs | 600100 |
milestone | 22.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/generic/nsBlockFrame.h +++ b/layout/generic/nsBlockFrame.h @@ -475,27 +475,27 @@ public: * * @returns true, if any of the floats at the beginning of our mFloats list * have the NS_FRAME_IS_PUSHED_FLOAT bit set; false otherwise. */ bool HasPushedFloatsFromPrevContinuation() const { if (!mFloats.IsEmpty()) { // If we have pushed floats, then they should be at the beginning of our // float list. - if (mFloats.FrameAt(0)->GetStateBits() & NS_FRAME_IS_PUSHED_FLOAT) { + if (mFloats.FirstChild()->GetStateBits() & NS_FRAME_IS_PUSHED_FLOAT) { return true; } } #ifdef DEBUG // Double-check the above assertion that pushed floats should be at the // beginning of our floats list. - for (int32_t i = 0; i < mFloats.GetLength(); i++) { - NS_ASSERTION(!(mFloats.FrameAt(i)->GetStateBits() & - NS_FRAME_IS_PUSHED_FLOAT), + for (nsFrameList::Enumerator e(mFloats); !e.AtEnd(); e.Next()) { + nsIFrame* f = e.get(); + NS_ASSERTION(!(f->GetStateBits() & NS_FRAME_IS_PUSHED_FLOAT), "pushed floats must be at the beginning of the float list"); } #endif return false; } protected: