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

14
layout/tables/nsTableWrapperFrame.cpp
View File

@@ -70,7 +70,7 @@ void nsTableWrapperFrame::DestroyFrom(nsIFrame* aDestructRoot,
const nsFrameList& nsTableWrapperFrame::GetChildList(
ChildListID aListID) const {
if (aListID == FrameChildListID::Caption) {
if (aListID == kCaptionList) {
return mCaptionFrames;
}
@@ -79,12 +79,12 @@ const nsFrameList& nsTableWrapperFrame::GetChildList(
void nsTableWrapperFrame::GetChildLists(nsTArray<ChildList>* aLists) const {
nsContainerFrame::GetChildLists(aLists);
mCaptionFrames.AppendIfNonempty(aLists, FrameChildListID::Caption);
mCaptionFrames.AppendIfNonempty(aLists, kCaptionList);
}
void nsTableWrapperFrame::SetInitialChildList(ChildListID aListID,
nsFrameList&& aChildList) {
if (FrameChildListID::Caption == aListID) {
if (kCaptionList == aListID) {
#ifdef DEBUG
nsIFrame::VerifyDirtyBitSet(aChildList);
for (nsIFrame* f : aChildList) {
@@ -96,7 +96,7 @@ void nsTableWrapperFrame::SetInitialChildList(ChildListID aListID,
"already have child frames in CaptionList");
mCaptionFrames = std::move(aChildList);
} else {
MOZ_ASSERT(FrameChildListID::Principal != aListID ||
MOZ_ASSERT(kPrincipalList != aListID ||
(aChildList.FirstChild() &&
aChildList.FirstChild() == aChildList.LastChild() &&
aChildList.FirstChild()->IsTableFrame()),
@@ -109,7 +109,7 @@ void nsTableWrapperFrame::AppendFrames(ChildListID aListID,
nsFrameList&& aFrameList) {
// We only have two child frames: the inner table and a caption frame.
// The inner frame is provided when we're initialized, and it cannot change
MOZ_ASSERT(FrameChildListID::Caption == aListID, "unexpected child list");
MOZ_ASSERT(kCaptionList == aListID, "unexpected child list");
MOZ_ASSERT(aFrameList.IsEmpty() || aFrameList.FirstChild()->IsTableCaption(),
"appending non-caption frame to captionList");
mCaptionFrames.AppendFrames(nullptr, std::move(aFrameList));
@@ -127,7 +127,7 @@ void nsTableWrapperFrame::AppendFrames(ChildListID aListID,
void nsTableWrapperFrame::InsertFrames(
ChildListID aListID, nsIFrame* aPrevFrame,
const nsLineList::iterator* aPrevFrameLine, nsFrameList&& aFrameList) {
MOZ_ASSERT(FrameChildListID::Caption == aListID, "unexpected child list");
MOZ_ASSERT(kCaptionList == aListID, "unexpected child list");
MOZ_ASSERT(aFrameList.IsEmpty() || aFrameList.FirstChild()->IsTableCaption(),
"inserting non-caption frame into captionList");
MOZ_ASSERT(!aPrevFrame || aPrevFrame->GetParent() == this,
@@ -145,7 +145,7 @@ void nsTableWrapperFrame::RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame) {
// We only have two child frames: the inner table and one caption frame.
// The inner frame can't be removed so this should be the caption
MOZ_ASSERT(FrameChildListID::Caption == aListID, "can't remove inner frame");
MOZ_ASSERT(kCaptionList == aListID, "can't remove inner frame");
if (HasSideCaption()) {
// The old caption isize had an effect on the inner table isize, so