Bug 1638928 Part 2 - Rename nsIFrame's GetChildLists() to ChildLists(). r=mats

This patch is generated by using my editor's rename functionality.

In the next patch, `nsIFrame::` prefix is going to be removed manually
from all the ChildLists() calls.

Differential Revision: https://phabricator.services.mozilla.com/D75893
This commit is contained in:
Ting-Yu Lin 2020-05-19 12:37:37 +00:00
Родитель bd1f4fd1bd
Коммит 162c8d3a67
21 изменённых файлов: 51 добавлений и 51 удалений

Просмотреть файл

@ -1274,7 +1274,7 @@ nsRect AccessibleCaretManager::GetAllChildFrameRectsUnion(
frame = frame->GetNextContinuation()) {
nsRect frameRect;
for (const auto& childList : frame->GetChildLists()) {
for (const auto& childList : frame->ChildLists()) {
// Loop all children to union their scrollable overflow rect.
for (nsIFrame* child : childList.mList) {
nsRect childRect = child->GetScrollableOverflowRectRelativeToSelf();

Просмотреть файл

@ -2745,7 +2745,7 @@ void PresShell::FrameNeedsReflow(nsIFrame* aFrame,
}
}
for (const auto& childList : f->GetChildLists()) {
for (const auto& childList : f->ChildLists()) {
for (nsIFrame* kid : childList.mList) {
if (styleChange) {
kid->MarkIntrinsicISizesDirty();
@ -3990,7 +3990,7 @@ static void AssertFrameSubtreeIsSane(const nsIFrame& aRoot) {
"Node not in the flattened tree still has a frame?");
}
for (const auto& childList : aRoot.GetChildLists()) {
for (const auto& childList : aRoot.ChildLists()) {
for (const nsIFrame* child : childList.mList) {
AssertFrameSubtreeIsSane(*child);
}
@ -5828,7 +5828,7 @@ void PresShell::MarkFramesInSubtreeApproximatelyVisible(
// We assume all frames in popups are visible, so we skip them here.
const nsIFrame::ChildListIDs skip = {nsIFrame::kPopupList,
nsIFrame::kSelectPopupList};
for (const auto& [list, listID] : aFrame->GetChildLists()) {
for (const auto& [list, listID] : aFrame->ChildLists()) {
if (skip.contains(listID)) {
continue;
}
@ -9933,8 +9933,8 @@ static bool CompareTrees(nsPresContext* aFirstPresContext,
// if (aFirstFrame->IsScrollbarFrame())
// return true;
bool ok = true;
const auto& childLists1 = aFirstFrame->GetChildLists();
const auto& childLists2 = aSecondFrame->GetChildLists();
const auto& childLists1 = aFirstFrame->ChildLists();
const auto& childLists2 = aSecondFrame->ChildLists();
auto iterLists1 = childLists1.begin();
auto iterLists2 = childLists2.begin();
do {

Просмотреть файл

@ -922,7 +922,7 @@ static bool ContainingBlockChangeAffectsDescendants(
// All fixed-pos containing blocks should also be abs-pos containing blocks.
MOZ_ASSERT_IF(aIsFixedPosContainingBlock, aIsAbsPosContainingBlock);
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* f : childList.mList) {
if (f->IsPlaceholderFrame()) {
nsIFrame* outOfFlow = nsPlaceholderFrame::GetRealFrameForPlaceholder(f);
@ -1102,7 +1102,7 @@ static void SyncViewsAndInvalidateDescendants(nsIFrame* aFrame,
aFrame->SyncFrameViewProperties();
for (const auto& [list, listID] : aFrame->GetChildLists()) {
for (const auto& [list, listID] : aFrame->ChildLists()) {
for (nsIFrame* child : list) {
if (!(child->GetStateBits() & NS_FRAME_OUT_OF_FLOW)) {
// only do frames that don't have placeholders
@ -1172,7 +1172,7 @@ static void AddSubtreeToOverflowTracker(
aOverflowChangedTracker.AddFrame(aFrame,
OverflowChangedTracker::CHILDREN_CHANGED);
}
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* child : childList.mList) {
AddSubtreeToOverflowTracker(child, aOverflowChangedTracker);
}
@ -3562,7 +3562,7 @@ void RestyleManager::ReparentFrameDescendants(nsIFrame* aFrame,
// that is going to go away anyway in seconds.
return;
}
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* child : childList.mList) {
// only do frames that are in flow
if (!(child->GetStateBits() & NS_FRAME_OUT_OF_FLOW) &&

Просмотреть файл

@ -163,7 +163,7 @@ void nsFrameManager::CaptureFrameState(nsIFrame* aFrame,
CaptureFrameStateFor(aFrame, aState);
// Now capture state recursively for the frame hierarchy rooted at aFrame
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* child : childList.mList) {
if (child->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
// We'll pick it up when we get to its placeholder
@ -233,7 +233,7 @@ void nsFrameManager::RestoreFrameState(nsIFrame* aFrame,
RestoreFrameStateFor(aFrame, aState);
// Now restore state recursively for the frame hierarchy rooted at aFrame
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* child : childList.mList) {
RestoreFrameState(child, aState);
}

Просмотреть файл

@ -550,7 +550,7 @@ void nsLayoutUtils::UnionChildOverflow(nsIFrame* aFrame,
FrameChildListIDs skip(aSkipChildLists);
skip += {nsIFrame::kSelectPopupList, nsIFrame::kPopupList};
for (const auto& [list, listID] : aFrame->GetChildLists()) {
for (const auto& [list, listID] : aFrame->ChildLists()) {
if (skip.contains(listID)) {
continue;
}
@ -1414,7 +1414,7 @@ nsContainerFrame* nsLayoutUtils::LastContinuationWithChild(
nsContainerFrame* aFrame) {
MOZ_ASSERT(aFrame, "NULL frame pointer");
for (auto f = aFrame->LastContinuation(); f; f = f->GetPrevContinuation()) {
for (const auto& childList : f->GetChildLists()) {
for (const auto& childList : f->ChildLists()) {
if (MOZ_LIKELY(!childList.mList.IsEmpty())) {
return static_cast<nsContainerFrame*>(f);
}
@ -5862,7 +5862,7 @@ void nsLayoutUtils::MarkDescendantsDirty(nsIFrame* aSubtreeRoot) {
}
}
for (const auto& childList : f->GetChildLists()) {
for (const auto& childList : f->ChildLists()) {
for (nsIFrame* kid : childList.mList) {
stack.AppendElement(kid);
}
@ -5886,7 +5886,7 @@ void nsLayoutUtils::MarkIntrinsicISizesDirtyIfDependentOnBSize(
}
f->MarkIntrinsicISizesDirty();
for (const auto& childList : f->GetChildLists()) {
for (const auto& childList : f->ChildLists()) {
for (nsIFrame* kid : childList.mList) {
stack.AppendElement(kid);
}
@ -6518,7 +6518,7 @@ nscoord nsLayoutUtils::CalculateContentBEnd(WritingMode aWM, nsIFrame* aFrame) {
std::max(contentBEnd, CalculateBlockContentBEnd(aWM, blockFrame));
skip += nsIFrame::kPrincipalList;
}
for (const auto& [list, listID] : aFrame->GetChildLists()) {
for (const auto& [list, listID] : aFrame->ChildLists()) {
if (!skip.contains(listID)) {
for (nsIFrame* child : list) {
nscoord offset =
@ -7918,7 +7918,7 @@ void nsLayoutUtils::AssertTreeOnlyEmptyNextInFlows(nsIFrame* aSubtreeRoot) {
NS_ASSERTION(start == end || IsInLetterFrame(aSubtreeRoot),
"frame tree not empty, but caller reported complete status");
for (const auto& childList : aSubtreeRoot->GetChildLists()) {
for (const auto& childList : aSubtreeRoot->ChildLists()) {
for (nsIFrame* child : childList.mList) {
nsLayoutUtils::AssertTreeOnlyEmptyNextInFlows(child);
}
@ -8111,7 +8111,7 @@ size_t nsLayoutUtils::SizeOfTextRunsForFrames(nsIFrame* aFrame,
return total;
}
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* f : childList.mList) {
total += SizeOfTextRunsForFrames(f, aMallocSizeOf, clear);
}

Просмотреть файл

@ -121,7 +121,7 @@ void DetailsFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
bool DetailsFrame::HasMainSummaryFrame(nsIFrame* aSummaryFrame) {
const ChildListIDs flowLists = {kPrincipalList, kOverflowList};
for (nsIFrame* frag = this; frag; frag = frag->GetNextInFlow()) {
for (const auto& [list, listID] : frag->GetChildLists()) {
for (const auto& [list, listID] : frag->ChildLists()) {
if (!flowLists.contains(listID)) {
continue;
}

Просмотреть файл

@ -592,7 +592,7 @@ void ReflowInput::InitResizeFlags(nsPresContext* aPresContext,
do {
nsIFrame* f = stack.PopLastElement();
for (const auto& childList : f->GetChildLists()) {
for (const auto& childList : f->ChildLists()) {
for (nsIFrame* kid : childList.mList) {
kid->MarkIntrinsicISizesDirty();
stack.AppendElement(kid);

Просмотреть файл

@ -636,7 +636,7 @@ ScrollAnchorContainer::ExamineAnchorCandidate(nsIFrame* aFrame) const {
nsIFrame* ScrollAnchorContainer::FindAnchorIn(nsIFrame* aFrame) const {
// Visit the child lists of this frame
for (const auto& [list, listID] : aFrame->GetChildLists()) {
for (const auto& [list, listID] : aFrame->ChildLists()) {
// Skip child lists that contain out-of-flow frames, we'll visit them by
// following placeholders in the in-flow lists so that we visit these
// frames in DOM order.

Просмотреть файл

@ -526,7 +526,7 @@ void nsBlockFrame::List(FILE* out, const char* aPrefix,
// skip the principal list - we printed the lines above
// skip the overflow list - we printed the overflow lines above
ChildListIDs skip = {kPrincipalList, kOverflowList};
for (const auto& [list, listID] : nsIFrame::GetChildLists()) {
for (const auto& [list, listID] : nsIFrame::ChildLists()) {
if (skip.contains(listID)) {
continue;
}

Просмотреть файл

@ -995,7 +995,7 @@ void nsContainerFrame::PositionChildViews(nsIFrame* aFrame) {
// view for popups is managed by the parent. Currently only nsMenuFrame
// and nsPopupSetFrame have a popupList and during layout will adjust the
// view manually to position the popup.
for (const auto& [list, listID] : aFrame->GetChildLists()) {
for (const auto& [list, listID] : aFrame->ChildLists()) {
if (listID == kPopupList) {
continue;
}
@ -2423,7 +2423,7 @@ void nsContainerFrame::SanityCheckChildListsBeforeReflow() const {
"At start of reflow, we should've pulled items back from all "
"NIFs and cleared the state bit stored in didPushItemsBit in "
"the process.");
for (const auto& [list, listID] : f->GetChildLists()) {
for (const auto& [list, listID] : f->ChildLists()) {
if (!itemLists.contains(listID)) {
MOZ_ASSERT(absLists.contains(listID) || listID == kBackdropList,
"unexpected non-empty child list");
@ -2484,7 +2484,7 @@ void nsContainerFrame::List(FILE* out, const char* aPrefix,
// Output the children
bool outputOneList = false;
for (const auto& [list, listID] : nsIFrame::GetChildLists()) {
for (const auto& [list, listID] : nsIFrame::ChildLists()) {
if (outputOneList) {
str += aPrefix;
}
@ -2529,7 +2529,7 @@ void nsContainerFrame::ListWithMatchedRules(FILE* out,
childPrefix += aPrefix;
childPrefix += " ";
for (const auto& childList : nsIFrame::GetChildLists()) {
for (const auto& childList : nsIFrame::ChildLists()) {
for (const nsIFrame* kid : childList.mList) {
kid->ListWithMatchedRules(out, childPrefix.get());
}

Просмотреть файл

@ -2207,7 +2207,7 @@ static bool FrameHasRelativeBSizeDependency(nsIFrame* aFrame) {
if (aFrame->HasAnyStateBits(NS_FRAME_CONTAINS_RELATIVE_BSIZE)) {
return true;
}
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* childFrame : childList.mList) {
if (childFrame->HasAnyStateBits(NS_FRAME_CONTAINS_RELATIVE_BSIZE)) {
return true;

Просмотреть файл

@ -320,7 +320,7 @@ void nsFontInflationData::ScanTextIn(nsIFrame* aFrame) {
// FIXME: Should probably only scan the text that's actually going to
// be inflated!
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* kid : childList.mList) {
if (kid->GetStateBits() & NS_FRAME_FONT_INFLATION_FLOW_ROOT) {
// Goes in a different set of inflation data.

Просмотреть файл

@ -365,7 +365,7 @@ bool nsIFrame::CheckAndClearPaintedState() {
bool result = (GetStateBits() & NS_FRAME_PAINTED_THEBES);
RemoveStateBits(NS_FRAME_PAINTED_THEBES);
for (const auto& childList : GetChildLists()) {
for (const auto& childList : ChildLists()) {
for (nsIFrame* child : childList.mList) {
if (child->CheckAndClearPaintedState()) {
result = true;
@ -379,7 +379,7 @@ bool nsIFrame::CheckAndClearDisplayListState() {
bool result = BuiltDisplayList();
SetBuiltDisplayList(false);
for (const auto& childList : GetChildLists()) {
for (const auto& childList : ChildLists()) {
for (nsIFrame* child : childList.mList) {
if (child->CheckAndClearDisplayListState()) {
result = true;
@ -1459,7 +1459,7 @@ void nsIFrame::ReparentFrameViewTo(nsViewManager* aViewManager,
aViewManager->InsertChild(aNewParentView, view, insertBefore,
insertBefore != nullptr);
} else if (GetStateBits() & NS_FRAME_HAS_CHILD_WITH_VIEW) {
for (const auto& childList : GetChildLists()) {
for (const auto& childList : ChildLists()) {
// Iterate the child frames, and check each child frame to see if it has
// a view
for (nsIFrame* child : childList.mList) {
@ -5798,7 +5798,7 @@ void nsIFrame::MarkSubtreeDirty() {
// - TableColGroup
// - XULBox
AutoTArray<nsIFrame*, 32> stack;
for (const auto& childLists : GetChildLists()) {
for (const auto& childLists : ChildLists()) {
for (nsIFrame* kid : childLists.mList) {
stack.AppendElement(kid);
}
@ -5812,7 +5812,7 @@ void nsIFrame::MarkSubtreeDirty() {
f->AddStateBits(NS_FRAME_IS_DIRTY);
for (const auto& childLists : f->GetChildLists()) {
for (const auto& childLists : f->ChildLists()) {
for (nsIFrame* kid : childLists.mList) {
stack.AppendElement(kid);
}
@ -6763,7 +6763,7 @@ nsRect nsContainerFrame::ComputeSimpleTightBounds(
}
nsRect r(0, 0, 0, 0);
for (const auto& childLists : nsIFrame::GetChildLists()) {
for (const auto& childLists : nsIFrame::ChildLists()) {
for (nsIFrame* child : childLists.mList) {
r.UnionRect(
r, child->ComputeTightBounds(aDrawTarget) + child->GetPosition());
@ -9627,7 +9627,7 @@ static nsRect UnionBorderBoxes(
nsIFrame::kPopupList, nsIFrame::kSelectPopupList,
nsIFrame::kAbsoluteList, nsIFrame::kFixedList,
nsIFrame::kFloatList, nsIFrame::kOverflowList};
for (const auto& [list, listID] : aFrame->GetChildLists()) {
for (const auto& [list, listID] : aFrame->ChildLists()) {
if (skip.contains(listID)) {
continue;
}
@ -9975,7 +9975,7 @@ bool nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
void nsIFrame::RecomputePerspectiveChildrenOverflow(
const nsIFrame* aStartFrame) {
for (const auto& childList : GetChildLists()) {
for (const auto& childList : ChildLists()) {
for (nsIFrame* child : childList.mList) {
if (!child->FrameMaintainsOverflow()) {
continue; // frame does not maintain overflow rects
@ -10014,7 +10014,7 @@ void nsIFrame::ComputePreserve3DChildrenOverflow(
nsRect childVisual;
nsRect childScrollable;
for (const auto& childList : GetChildLists()) {
for (const auto& childList : ChildLists()) {
for (nsIFrame* child : childList.mList) {
// If this child participates in the 3d context, then take the
// pre-transform region (which contains all descendants that aren't
@ -11456,7 +11456,7 @@ void nsIFrame::AddSizeOfExcludingThisForTree(nsWindowSizes& aSizes) const {
}
}
for (const auto& childList : GetChildLists()) {
for (const auto& childList : ChildLists()) {
for (const nsIFrame* f : childList.mList) {
f->AddSizeOfExcludingThisForTree(aSizes);
}
@ -11624,7 +11624,7 @@ CompositorHitTestInfo nsIFrame::GetCompositorHitTestInfo(
// Returns true if we can guarantee there is no visible descendants.
static bool HasNoVisibleDescendants(const nsIFrame* aFrame) {
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* f : childList.mList) {
if (nsPlaceholderFrame::GetRealFrameFor(f)
->IsVisibleOrMayHaveVisibleDescendants()) {

Просмотреть файл

@ -956,7 +956,7 @@ static void GetScrollableOverflowForPerspective(
nsPoint aOffset, nsRect& aScrolledFrameOverflowArea) {
// Iterate over all children except pop-ups.
FrameChildListIDs skip = {nsIFrame::kSelectPopupList, nsIFrame::kPopupList};
for (const auto& [list, listID] : aCurrentFrame->GetChildLists()) {
for (const auto& [list, listID] : aCurrentFrame->ChildLists()) {
if (skip.contains(listID)) {
continue;
}
@ -2412,7 +2412,7 @@ static void AdjustViews(nsIFrame* aFrame) {
// Call AdjustViews recursively for all child frames except the popup list as
// the views for popups are not scrolled.
for (const auto& [list, listID] : aFrame->GetChildLists()) {
for (const auto& [list, listID] : aFrame->ChildLists()) {
if (listID == nsIFrame::kPopupList) {
continue;
}
@ -6925,7 +6925,7 @@ static void CollectScrollPositionsForSnap(
return;
}
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* f : childList.mList) {
const nsStyleDisplay* styleDisplay = f->StyleDisplay();
if (styleDisplay->mScrollSnapAlign.inline_ !=
@ -7118,7 +7118,7 @@ static nsSliderFrame* GetSliderFrame(nsIFrame* aScrollbarFrame) {
return nullptr;
}
for (const auto& childList : aScrollbarFrame->GetChildLists()) {
for (const auto& childList : aScrollbarFrame->ChildLists()) {
for (nsIFrame* frame : childList.mList) {
if (nsSliderFrame* sliderFrame = do_QueryFrame(frame)) {
return sliderFrame;

Просмотреть файл

@ -1652,7 +1652,7 @@ class nsIFrame : public nsQueryFrame {
/**
* Returns the child lists for this frame.
*/
AutoTArray<ChildList, 4> GetChildLists() const {
AutoTArray<ChildList, 4> ChildLists() const {
AutoTArray<ChildList, 4> childLists;
GetChildLists(&childLists);
return childLists;

Просмотреть файл

@ -405,7 +405,7 @@ static void GetPrintCanvasElementsInFrame(
if (!aFrame) {
return;
}
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* child : childList.mList) {
// Check if child is a nsHTMLCanvasFrame.
nsHTMLCanvasFrame* canvasFrame = do_QueryFrame(child);

Просмотреть файл

@ -982,7 +982,7 @@ nsIDocShell* nsSubDocumentFrame::GetDocShell() {
static void DestroyDisplayItemDataForFrames(nsIFrame* aFrame) {
FrameLayerBuilder::DestroyDisplayItemDataFor(aFrame);
for (const auto& childList : aFrame->GetChildLists()) {
for (const auto& childList : aFrame->ChildLists()) {
for (nsIFrame* child : childList.mList) {
DestroyDisplayItemDataForFrames(child);
}

Просмотреть файл

@ -1261,7 +1261,7 @@ void nsDisplayListBuilder::MarkFramesForDisplayList(
*/
void nsDisplayListBuilder::MarkPreserve3DFramesForDisplayList(
nsIFrame* aDirtyFrame) {
for (const auto& childList : aDirtyFrame->GetChildLists()) {
for (const auto& childList : aDirtyFrame->ChildLists()) {
for (nsIFrame* child : childList.mList) {
if (child->Combines3DTransformWithAncestors()) {
MarkFrameForDisplay(child, aDirtyFrame);

Просмотреть файл

@ -182,7 +182,7 @@ void nsFontFaceUtils::MarkDirtyForFontChange(nsIFrame* aSubtreeRoot,
}
}
for (const auto& childList : f->GetChildLists()) {
for (const auto& childList : f->ChildLists()) {
for (nsIFrame* kid : childList.mList) {
stack.AppendElement(std::make_pair(kid, alreadyScheduled));
}

Просмотреть файл

@ -200,7 +200,7 @@ void nsDeckFrame::Animate(nsIFrame* aParentBox, bool start) {
imgFrame->StopAnimation();
}
for (const auto& childList : aParentBox->GetChildLists()) {
for (const auto& childList : aParentBox->ChildLists()) {
for (nsIFrame* child : childList.mList) {
Animate(child, start);
}

Просмотреть файл

@ -272,7 +272,7 @@ int32_t nsScrollbarFrame::MoveToNewPosition() {
return curpos;
}
// notify all nsSliderFrames of the change
for (const auto& childList : nsIFrame::GetChildLists()) {
for (const auto& childList : nsIFrame::ChildLists()) {
for (nsIFrame* f : childList.mList) {
nsSliderFrame* sliderFrame = do_QueryFrame(f);
if (sliderFrame) {