corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1799732) for causing build bustages in nsIFrame.cpp CLOSED TREE

Browse Source 
Backed out changeset e559f9dbc76f (bug 1799732)
Backed out changeset c40fda7a8b0b (bug 1799732)
Backed out changeset 1f84bfb41ab8 (bug 1799732)
This commit is contained in:
Noemi Erli
2022-11-12 02:16:45 +02:00
parent 7c6d80d4ea
commit a66dba1527
54 changed files with 500 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
layout/forms/nsFieldSetFrame.cpp
View File

@@ -789,15 +789,14 @@ void nsFieldSetFrame::SetInitialChildList(ChildListID aListID,
// https://html.spec.whatwg.org/multipage/rendering.html#rendered-legend
legend->AddStateBits(NS_BLOCK_FORMATTING_CONTEXT_STATE_BITS);
}
MOZ_ASSERT(
aListID != FrameChildListID::Principal || GetInner() || GetLegend(),
"Setting principal child list should populate our inner frame "
"or our rendered legend");
MOZ_ASSERT(aListID != kPrincipalList || GetInner() || GetLegend(),
"Setting principal child list should populate our inner frame "
"or our rendered legend");
}
void nsFieldSetFrame::AppendFrames(ChildListID aListID,
nsFrameList&& aFrameList) {
MOZ_ASSERT(aListID == FrameChildListID::NoReflowPrincipal &&
MOZ_ASSERT(aListID == kNoReflowPrincipalList &&
HasAnyStateBits(NS_FRAME_FIRST_REFLOW),
"AppendFrames should only be used from "
"nsCSSFrameConstructor::ConstructFieldSetFrame");
@@ -808,10 +807,9 @@ void nsFieldSetFrame::AppendFrames(ChildListID aListID,
void nsFieldSetFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame,
const nsLineList::iterator* aPrevFrameLine,
nsFrameList&& aFrameList) {
MOZ_ASSERT(
aListID == FrameChildListID::Principal && !aPrevFrame && !GetLegend(),
"InsertFrames should only be used to prepend a rendered legend "
"from nsCSSFrameConstructor::ConstructFramesFromItemList");
MOZ_ASSERT(aListID == kPrincipalList && !aPrevFrame && !GetLegend(),
"InsertFrames should only be used to prepend a rendered legend "
"from nsCSSFrameConstructor::ConstructFramesFromItemList");
nsContainerFrame::InsertFrames(aListID, aPrevFrame, aPrevFrameLine,
std::move(aFrameList));
MOZ_ASSERT(GetLegend());
@@ -910,7 +908,7 @@ void nsFieldSetFrame::EnsureChildContinuation(nsIFrame* aChild,
if (aStatus.IsFullyComplete()) {
if (nif) {
// NOTE: we want to avoid our DEBUG version of RemoveFrame above.
nsContainerFrame::RemoveFrame(FrameChildListID::NoReflowPrincipal, nif);
nsContainerFrame::RemoveFrame(kNoReflowPrincipalList, nif);
MOZ_ASSERT(!aChild->GetNextInFlow());
}
} else {