diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-10-03 20:00:02 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-10-04 16:32:25 +0000 |
| commit | 2dc264047edad770c1ac4513a1e7844ef4365fa7 (patch) | |
| tree | d752598a35740362fbdd07f507d4865d7be82006 /layout | |
| parent | 6d5b934dc08792d2833fefae6acddaf8f3bfd02b (diff) | |
| download | uxp-2dc264047edad770c1ac4513a1e7844ef4365fa7.tar.gz | |
Fix some debug assertions.
refactored code porting in assertions causing debug build failures.
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/generic/nsGridContainerFrame.cpp | 1 | ||||
| -rw-r--r-- | layout/generic/nsPageContentFrame.cpp | 2 | ||||
| -rw-r--r-- | layout/generic/nsPageFrame.cpp | 2 | ||||
| -rw-r--r-- | layout/generic/nsVideoFrame.cpp | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp index 34113e4fa7..1e1afac234 100644 --- a/layout/generic/nsGridContainerFrame.cpp +++ b/layout/generic/nsGridContainerFrame.cpp @@ -5887,7 +5887,6 @@ nsGridContainerFrame::ReflowChildren(GridReflowInput& aState, nsReflowStatus& aStatus) { MOZ_ASSERT(aState.mReflowInput); - MOZ_ASSERT(aStatus.IsEmpty(), "Caller should pass a fresh reflow status!"); aStatus = NS_FRAME_COMPLETE; nsOverflowAreas ocBounds; diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp index cb558374db..5a7af2ec85 100644 --- a/layout/generic/nsPageContentFrame.cpp +++ b/layout/generic/nsPageContentFrame.cpp @@ -91,7 +91,7 @@ nsPageContentFrame::Reflow(nsPresContext* aPresContext, FinishReflowChild(frame, aPresContext, aDesiredSize, &kidReflowInput, 0, 0, ReflowChildFlags::Default); - NS_ASSERTION(aPresContext->IsDynamic() || !aStatus.IsFullyComplete() || + NS_ASSERTION(aPresContext->IsDynamic() || !NS_FRAME_IS_FULLY_COMPLETE(aStatus) || !frame->GetNextInFlow(), "bad child flow list"); } diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index 6120e35103..1327b3932b 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/layout/generic/nsPageFrame.cpp @@ -148,7 +148,7 @@ nsPageFrame::Reflow(nsPresContext* aPresContext, FinishReflowChild(frame, aPresContext, aDesiredSize, &kidReflowInput, xc, yc, ReflowChildFlags::Default); - NS_ASSERTION(!aStatus.IsFullyComplete() || !frame->GetNextInFlow(), + NS_ASSERTION(!NS_FRAME_IS_FULLY_COMPLETE(aStatus) || !frame->GetNextInFlow(), "bad child flow list"); } PR_PL(("PageFrame::Reflow %p ", this)); diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp index 7986f672c1..fb7cefd504 100644 --- a/layout/generic/nsVideoFrame.cpp +++ b/layout/generic/nsVideoFrame.cpp @@ -337,7 +337,7 @@ nsVideoFrame::Reflow(nsPresContext* aPresContext, ReflowChild(imageFrame, aPresContext, kidDesiredSize, kidReflowInput, posterRenderRect.x, posterRenderRect.y, ReflowChildFlags::Default, childStatus); - MOZ_ASSERT(childStatus.IsFullyComplete(), + MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(childStatus), "We gave our child unconstrained available block-size, " "so it should be complete!"); @@ -380,7 +380,7 @@ nsVideoFrame::Reflow(nsPresContext* aPresContext, ReflowChild(child, aPresContext, kidDesiredSize, kidReflowInput, mBorderPadding.left, mBorderPadding.top, ReflowChildFlags::Default, childStatus); - MOZ_ASSERT(childStatus.IsFullyComplete(), + MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(childStatus), "We gave our child unconstrained available block-size, " "so it should be complete!"); |