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

Bug 1647525 - Use HasAnyStateBits() in nsFrameManager r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D81094
This commit is contained in:
Kagami Sascha Rosylight 2020-06-25 15:39:32 +00:00
parent 1793f22207
commit 70a090ba3a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/nsFrameManager.cpp
View File

@ -76,9 +76,9 @@ void nsFrameManager::InsertFrames(nsContainerFrame* aParentFrame,
MOZ_ASSERT(
!aPrevFrame ||
(!aPrevFrame->GetNextContinuation() ||
(((aPrevFrame->GetNextContinuation()->GetStateBits() &
NS_FRAME_IS_OVERFLOW_CONTAINER)) &&
!(aPrevFrame->GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER))),
(aPrevFrame->GetNextContinuation()->HasAnyStateBits(
NS_FRAME_IS_OVERFLOW_CONTAINER) &&
!aPrevFrame->HasAnyStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER))),
"aPrevFrame must be the last continuation in its chain!");
if (aParentFrame->IsAbsoluteContainer() &&
@ -104,7 +104,7 @@ void nsFrameManager::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) {
// nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames
aOldFrame->IsTextFrame(),
"Must remove first continuation.");
NS_ASSERTION(!(aOldFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW &&
NS_ASSERTION(!(aOldFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW) &&
aOldFrame->GetPlaceholderFrame()),
"Must call RemoveFrame on placeholder for out-of-flows.");
nsContainerFrame* parentFrame = aOldFrame->GetParent();
@ -165,7 +165,7 @@ void nsFrameManager::CaptureFrameState(nsIFrame* aFrame,
// Now capture state recursively for the frame hierarchy rooted at aFrame
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* child : childList.mList) {
if (child->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
if (child->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW)) {
// We'll pick it up when we get to its placeholder
continue;
}