From bb0d044a166d29aa3d3a1cb4e1cb790131e44032 Mon Sep 17 00:00:00 2001 From: Ting-Yu Lin Date: Fri, 7 Feb 2020 04:17:33 +0000 Subject: [PATCH] Bug 1613732 Part 2 - Remove unused ReflowChildFlags::NoVisibility. r=dholbert This bit is set, but no function uses it. Differential Revision: https://phabricator.services.mozilla.com/D61886 --HG-- extra : moz-landing-system : lando --- layout/forms/nsComboboxControlFrame.cpp | 1 - layout/generic/nsIFrame.h | 7 ++----- layout/xul/nsDeckFrame.cpp | 3 +-- layout/xul/nsMenuPopupFrame.cpp | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index d1eb0c2d3b74..d0af8f1806ea 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -439,7 +439,6 @@ void nsComboboxControlFrame::ReflowDropdown(nsPresContext* aPresContext, // dropped down ReflowChildFlags flags = mDroppedDown ? ReflowChildFlags::Default : ReflowChildFlags::NoMoveFrame | - ReflowChildFlags::NoVisibility | ReflowChildFlags::NoSizeView; // XXX Can this be different from the dropdown's writing mode? diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 523e9d77db3a..9baed8b5052d 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -2585,16 +2585,13 @@ class nsIFrame : public nsQueryFrame { // Don't size the frame's view. NoSizeView = 1 << 2, - // TODO: This flag is not used. Will be removed. - NoVisibility = 1 << 3, - // Only applies to ReflowChild; if true, don't delete the next-in-flow, even // if the reflow is fully complete. - NoDeleteNextInFlowChild = 1 << 4, + NoDeleteNextInFlowChild = 1 << 3, // Only applies to FinishReflowChild. Tell it to call // ApplyRelativePositioning. - ApplyRelativePositioning = 1 << 5 + ApplyRelativePositioning = 1 << 4, }; /** diff --git a/layout/xul/nsDeckFrame.cpp b/layout/xul/nsDeckFrame.cpp index ab24d781b9e8..2d72b6a3de18 100644 --- a/layout/xul/nsDeckFrame.cpp +++ b/layout/xul/nsDeckFrame.cpp @@ -213,8 +213,7 @@ nsDeckFrame::DoXULLayout(nsBoxLayoutState& aState) { // Make sure we tweak the state so it does not resize our children. // We will do that. ReflowChildFlags oldFlags = aState.LayoutFlags(); - aState.SetLayoutFlags(ReflowChildFlags::NoSizeView | - ReflowChildFlags::NoVisibility); + aState.SetLayoutFlags(ReflowChildFlags::NoSizeView); // do a normal layout nsresult rv = nsBoxFrame::DoXULLayout(aState); diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp index 663fa27b1f7a..b562576a44d1 100644 --- a/layout/xul/nsMenuPopupFrame.cpp +++ b/layout/xul/nsMenuPopupFrame.cpp @@ -989,8 +989,7 @@ void nsMenuPopupFrame::HidePopup(bool aDeselectMenu, nsPopupState aNewState) { } nsIFrame::ReflowChildFlags nsMenuPopupFrame::GetXULLayoutFlags() { - return ReflowChildFlags::NoSizeView | ReflowChildFlags::NoMoveView | - ReflowChildFlags::NoVisibility; + return ReflowChildFlags::NoSizeView | ReflowChildFlags::NoMoveView; } nsPoint nsMenuPopupFrame::AdjustPositionForAnchorAlign(nsRect& anchorRect,