Backed out changeset c3780baf6f24 (bug 1789255) for causing build bustages CLOSED TREE

dom/base/DOMIntersectionObserver.cpp

@@ -613,7 +613,7 @@ IntersectionOutput DOMIntersectionObserver::Intersect(
   // true even if both the root and the target elements are in the skipped
   // contents."
   // https://drafts.csswg.org/css-contain/#cv-notes
-  if (targetFrame->IsHiddenByContentVisibilityOnAnyAncestor()) {
+  if (targetFrame->AncestorHidesContent()) {
     return {isSimilarOrigin};
   }
 

dom/base/Element.cpp

@@ -724,7 +724,7 @@ bool Element::CheckVisibility(const CheckVisibilityOptions& aOptions) {
     return false;
   }
 
-  if (f->IsHiddenByContentVisibilityOnAnyAncestor()) {
+  if (f->AncestorHidesContent()) {
     // 2. If a shadow-including ancestor of this has content-visibility: hidden,
     // return false.
     return false;

dom/base/nsRange.cpp

@@ -3145,11 +3145,11 @@ static bool IsVisibleAndNotInReplacedElement(nsIFrame* aFrame) {
       aFrame->HasAnyStateBits(NS_FRAME_IS_NONDISPLAY)) {
     return false;
   }
-  if (aFrame->HidesContent()) {
+  if (aFrame->IsContentHidden()) {
     return false;
   }
   for (nsIFrame* f = aFrame->GetParent(); f; f = f->GetParent()) {
-    if (f->HidesContent()) {
+    if (f->IsContentHidden()) {
       return false;
     }
     if (f->IsFrameOfType(nsIFrame::eReplaced) &&

layout/base/PresShell.cpp

@@ -3720,7 +3720,7 @@ void PresShell::DoScrollContentIntoView() {
   NS_ASSERTION(mDidInitialize, "should have done initial reflow by now");
 
   nsIFrame* frame = mContentToScrollTo->GetPrimaryFrame();
-  if (!frame || frame->IsHiddenByContentVisibilityOnAnyAncestor()) {
+  if (!frame || frame->AncestorHidesContent()) {
     mContentToScrollTo->RemoveProperty(nsGkAtoms::scrolling);
     mContentToScrollTo = nullptr;
     return;
@@ -3799,7 +3799,7 @@ bool PresShell::ScrollFrameRectIntoView(nsIFrame* aFrame, const nsRect& aRect,
                                         ScrollAxis aHorizontal,
                                         ScrollFlags aScrollFlags,
                                         const nsIFrame* aTarget) {
-  if (aFrame->IsHiddenByContentVisibilityOnAnyAncestor()) {
+  if (aFrame->AncestorHidesContent()) {
     return false;
   }
 
@@ -11866,7 +11866,7 @@ void PresShell::EnsureReflowIfFrameHasHiddenContent(nsIFrame* aFrame) {
   nsIFrame* topmostFrameWithContentHidden = nullptr;
   for (nsIFrame* cur = aFrame->GetInFlowParent(); cur;
        cur = cur->GetInFlowParent()) {
-    if (cur->HidesContent()) {
+    if (cur->IsContentHidden()) {
       topmostFrameWithContentHidden = cur;
       mHiddenContentInForcedLayout.Insert(cur->GetContent());
     }

layout/generic/nsBlockFrame.cpp

@@ -1314,7 +1314,7 @@ void nsBlockFrame::ClearLineClampEllipsis() { ::ClearLineClampEllipsis(this); }
 void nsBlockFrame::Reflow(nsPresContext* aPresContext, ReflowOutput& aMetrics,
                           const ReflowInput& aReflowInput,
                           nsReflowStatus& aStatus) {
-  if (IsHiddenByContentVisibilityOfInFlowParentForLayout()) {
+  if (GetInFlowParent() && GetInFlowParent()->IsContentHiddenForLayout()) {
     FinishAndStoreOverflow(&aMetrics, aReflowInput.mStyleDisplay);
     return;
   }
@@ -2579,6 +2579,10 @@ static bool LinesAreEmpty(const nsLineList& aList) {
 }
 
 void nsBlockFrame::ReflowDirtyLines(BlockReflowState& aState) {
+  if (IsContentHiddenForLayout()) {
+    return;
+  }
+
   bool keepGoing = true;
   bool repositionViews = false;  // should we really need this?
   bool foundAnyClears = aState.mFloatBreakType != StyleClear::None;
@@ -3365,15 +3369,6 @@ void nsBlockFrame::ReflowLine(BlockReflowState& aState, LineIterator aLine,
   aLine->InvalidateCachedIsEmpty();
   aLine->ClearHadFloatPushed();
 
-  // If this line contains a single block that is hidden by `content-visibility`
-  // don't reflow the line. If this line contains inlines and the first one is
-  // hidden by `content-visibility`, all of them are, so avoid reflow in that
-  // case as well.
-  nsIFrame* firstChild = aLine->mFirstChild;
-  if (firstChild->IsHiddenByContentVisibilityOfInFlowParentForLayout()) {
-    return;
-  }
-
   // Now that we know what kind of line we have, reflow it
   if (aLine->IsBlock()) {
     ReflowBlockFrame(aState, aLine, aKeepReflowGoing);
@@ -3582,10 +3577,6 @@ static inline bool IsNonAutoNonZeroBSize(const StyleSize& aCoord) {
 
 /* virtual */
 bool nsBlockFrame::IsSelfEmpty() {
-  if (IsHiddenByContentVisibilityOfInFlowParentForLayout()) {
-    return true;
-  }
-
   // Blocks which are margin-roots (including inline-blocks) cannot be treated
   // as empty for margin-collapsing and other purposes. They're more like
   // replaced elements.

layout/generic/nsFlexContainerFrame.cpp

@@ -4532,7 +4532,7 @@ void nsFlexContainerFrame::Reflow(nsPresContext* aPresContext,
                                   ReflowOutput& aReflowOutput,
                                   const ReflowInput& aReflowInput,
                                   nsReflowStatus& aStatus) {
-  if (IsHiddenByContentVisibilityOfInFlowParentForLayout()) {
+  if (GetInFlowParent() && GetInFlowParent()->IsContentHiddenForLayout()) {
     return;
   }
 
@@ -5267,10 +5267,9 @@ std::tuple<nscoord, bool> nsFlexContainerFrame::ReflowChildren(
     const LogicalMargin& aBorderPadding,
     const nscoord aSumOfPrevInFlowsChildrenBlockSize,
     const FlexboxAxisTracker& aAxisTracker, FlexLayoutResult& aFlr) {
-  if (HidesContentForLayout()) {
+  if (IsContentHiddenForLayout()) {
     return {0, false};
   }
-
   // Before giving each child a final reflow, calculate the origin of the
   // flex container's content box (with respect to its border-box), so that
   // we can compute our flex item's final positions.
@@ -5477,7 +5476,7 @@ void nsFlexContainerFrame::PopulateReflowOutput(
     // as their baseline, or our content is hidden in which case, we'll use the
     // wrong baseline (but no big deal).
     NS_WARNING_ASSERTION(
-        HidesContentForLayout() || aLines[0].IsEmpty(),
+        IsContentHidden() || aLines[0].IsEmpty(),
         "Have flex items but didn't get an ascent - that's odd (or there are "
         "just gigantic sizes involved)");
     // Per spec, synthesize baseline from the flex container's content box

layout/generic/nsGridContainerFrame.cpp

@@ -8428,12 +8428,13 @@ nscoord nsGridContainerFrame::ReflowChildren(GridReflowInput& aState,
                                              nsReflowStatus& aStatus) {
   WritingMode wm = aState.mReflowInput->GetWritingMode();
   nscoord bSize = aContentArea.BSize(wm);
-  MOZ_ASSERT(aState.mReflowInput);
-  MOZ_ASSERT(aStatus.IsEmpty(), "Caller should pass a fresh reflow status!");
-  if (HidesContentForLayout()) {
+  if (IsContentHiddenForLayout()) {
     return bSize;
   }
 
+  MOZ_ASSERT(aState.mReflowInput);
+  MOZ_ASSERT(aStatus.IsEmpty(), "Caller should pass a fresh reflow status!");
+
   OverflowAreas ocBounds;
   nsReflowStatus ocStatus;
   if (GetPrevInFlow()) {
@@ -8535,7 +8536,7 @@ void nsGridContainerFrame::Reflow(nsPresContext* aPresContext,
                                   ReflowOutput& aDesiredSize,
                                   const ReflowInput& aReflowInput,
                                   nsReflowStatus& aStatus) {
-  if (IsHiddenByContentVisibilityOfInFlowParentForLayout()) {
+  if (GetInFlowParent() && GetInFlowParent()->IsContentHiddenForLayout()) {
     return;
   }
 

layout/generic/nsHTMLCanvasFrame.cpp

@@ -519,7 +519,7 @@ void nsHTMLCanvasFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
 
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
-  if (HidesContent()) {
+  if (IsContentHidden()) {
     DisplaySelectionOverlay(aBuilder, aLists.Content(),
                             nsISelectionDisplay::DISPLAY_IMAGES);
     return;

layout/generic/nsIFrame.cpp

@@ -378,7 +378,7 @@ bool nsIFrame::IsVisibleConsideringAncestors(uint32_t aFlags) const {
     nsView* view = frame->GetView();
     if (view && view->GetVisibility() == nsViewVisibility_kHide) return false;
 
-    if (this != frame && frame->HidesContent()) return false;
+    if (this != frame && frame->IsContentHidden()) return false;
 
     nsIFrame* parent = frame->GetParent();
     nsDeckFrame* deck = do_QueryFrame(parent);
@@ -4019,7 +4019,7 @@ void nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
     return;
   }
 
-  if (HidesContent()) {
+  if (IsContentHidden()) {
     return;
   }
 
@@ -6750,7 +6750,7 @@ void nsIFrame::DidReflow(nsPresContext* aPresContext,
                          const ReflowInput* aReflowInput) {
   NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS, ("nsIFrame::DidReflow"));
 
-  if (IsHiddenByContentVisibilityOfInFlowParentForLayout()) {
+  if (GetInFlowParent() && GetInFlowParent()->IsContentHiddenForLayout()) {
     return;
   }
 
@@ -6858,7 +6858,7 @@ bool nsIFrame::IsContentDisabled() const {
   return element && element->IsDisabled();
 }
 
-bool nsIFrame::HidesContent() const {
+bool nsIFrame::IsContentHidden() const {
   if (!StyleDisplay()->IsContentVisibilityHidden()) {
     return false;
   }
@@ -6866,30 +6866,18 @@ bool nsIFrame::HidesContent() const {
   return IsFrameOfType(nsIFrame::eReplaced) || !StyleDisplay()->IsInlineFlow();
 }
 
-bool nsIFrame::HidesContentForLayout() const {
-  return HidesContent() && !PresShell()->IsForcingLayoutForHiddenContent(this);
+bool nsIFrame::IsContentHiddenForLayout() const {
+  return IsContentHidden() &&
+         !PresShell()->IsForcingLayoutForHiddenContent(this);
 }
 
-bool nsIFrame::IsHiddenByContentVisibilityOfInFlowParentForLayout() const {
-  const auto* parent = GetInFlowParent();
-  return parent && parent->HidesContentForLayout() && !Style()->IsAnonBox();
-}
-
-bool nsIFrame::IsHiddenByContentVisibilityOnAnyAncestor() const {
+bool nsIFrame::AncestorHidesContent() const {
   if (!StaticPrefs::layout_css_content_visibility_enabled()) {
     return false;
   }
 
-  bool isAnonymousBox = Style()->IsAnonBox();
   for (nsIFrame* cur = GetInFlowParent(); cur; cur = cur->GetInFlowParent()) {
-    // Anonymous boxes are not hidden by the content-visibility of their first
-    // non-anonymous ancestor, but can be hidden by ancestors further up the
-    // tree.
-    if (isAnonymousBox && !cur->Style()->IsAnonBox()) {
-      isAnonymousBox = false;
-    }
-
-    if (!isAnonymousBox && cur->HidesContent()) {
+    if (cur->IsContentHidden()) {
       return true;
     }
   }
@@ -8196,22 +8184,16 @@ bool nsIFrame::IsVisibleOrCollapsedForPainting() {
 }
 
 /* virtual */
-bool nsIFrame::IsEmpty() {
-  return IsHiddenByContentVisibilityOfInFlowParentForLayout();
-}
+bool nsIFrame::IsEmpty() { return false; }
 
 bool nsIFrame::CachedIsEmpty() {
-  MOZ_ASSERT(!HasAnyStateBits(NS_FRAME_IS_DIRTY) ||
-                 IsHiddenByContentVisibilityOfInFlowParentForLayout(),
-             "Must only be called on reflowed lines or those hidden by "
-             "content-visibility.");
+  MOZ_ASSERT(!HasAnyStateBits(NS_FRAME_IS_DIRTY),
+             "Must only be called on reflowed lines");
   return IsEmpty();
 }
 
 /* virtual */
-bool nsIFrame::IsSelfEmpty() {
-  return IsHiddenByContentVisibilityOfInFlowParentForLayout();
-}
+bool nsIFrame::IsSelfEmpty() { return false; }
 
 nsresult nsIFrame::GetSelectionController(nsPresContext* aPresContext,
                                           nsISelectionController** aSelCon) {
@@ -11655,7 +11637,7 @@ void nsIFrame::UpdateAnimationVisibility() {
     return;
   }
 
-  bool hidden = IsHiddenByContentVisibilityOnAnyAncestor();
+  bool hidden = AncestorHidesContent();
   if (animationCollection) {
     for (auto& animation : animationCollection->mAnimations) {
       animation->SetHiddenByContentVisibility(hidden);

layout/generic/nsIFrame.h

@@ -3146,30 +3146,22 @@ class nsIFrame : public nsQueryFrame {
   bool IsContentDisabled() const;
 
   /**
-   * Whether this frame hides its contents via the `content-visibility`
-   * property.
+   * Whether the content is hidden via the `content-visibilty` property.
    */
-  bool HidesContent() const;
+  bool IsContentHidden() const;
 
   /**
-   * Whether this frame hides its contents via the `content-visibility`
-   * property, while doing layout. This might be true when `HidesContent()` is
-   * true in the case that hidden content is being forced to lay out by position
-   * or size queries from script.
+   * Whether the content is hidden via the `content-visibilty` property for
+   * layout. Hidden content might not be hidden for layout when forcing layout
+   * for size queries.
    */
-  bool HidesContentForLayout() const;
+  bool IsContentHiddenForLayout() const;
 
   /**
    * Returns true if this frame is entirely hidden due the `content-visibility`
    * property on an ancestor.
    */
-  bool IsHiddenByContentVisibilityOnAnyAncestor() const;
-
-  /**
-   * Returns true is this frame is hidden by its first unskipped in flow
-   * ancestor due to `content-visibility`.
-   */
-  bool IsHiddenByContentVisibilityOfInFlowParentForLayout() const;
+  bool AncestorHidesContent() const;
 
   /**
    * Get the "type" of the frame.

layout/generic/nsImageFrame.cpp

@@ -2315,7 +2315,7 @@ void nsImageFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
 
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
-  if (HidesContent()) {
+  if (IsContentHidden()) {
     DisplaySelectionOverlay(aBuilder, aLists.Content(),
                             nsISelectionDisplay::DISPLAY_IMAGES);
     return;

layout/generic/nsSubDocumentFrame.cpp

@@ -356,7 +356,7 @@ void nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
     return;
   }
 
-  if (HidesContent()) {
+  if (IsContentHidden()) {
     return;
   }
 

layout/generic/nsVideoFrame.cpp

@@ -720,7 +720,7 @@ void nsVideoFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
 
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
-  if (HidesContent()) {
+  if (IsContentHidden()) {
     return;
   }
 

layout/style/nsStyleStruct.cpp

@@ -3605,7 +3605,7 @@ static nscoord Resolve(const StyleContainIntrinsicSize& aSize,
     Maybe<float> lastSize = aAxis == eLogicalAxisBlock
                                 ? element->GetLastRememberedBSize()
                                 : element->GetLastRememberedISize();
-    if (lastSize && aFrame.HidesContent()) {
+    if (lastSize && aFrame.IsContentHidden()) {
       return CSSPixel::ToAppUnits(*lastSize);
     }
   }

testing/web-platform/meta/css/css-sizing/contain-intrinsic-size/auto-007.html.ini

@@ -0,0 +1,12 @@
+[auto-007.html]
+  [.test 37]
+    expected: FAIL
+
+  [.test 16]
+    expected: FAIL
+
+  [.test 17]
+    expected: FAIL
+
+  [.test 18]
+    expected: FAIL

testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-fieldset-size-ref.html

@@ -1,14 +0,0 @@
-<!doctype HTML>
-<html>
-<meta charset="utf8">
-<title>CSS Content Visibility: fieldset hiding content</title>
-<link rel="author" title="Martin Robinson" href="mailto:mrobinson@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
-
-<style>
-fieldset {
-    background: green;
-}
-</style>
-
-<fieldset></fieldset>

testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-fieldset-size.html

@@ -1,17 +0,0 @@
-<!doctype HTML>
-<html>
-<meta charset="utf8">
-<title>CSS Content Visibility: fieldset hiding content</title>
-<link rel="author" title="Martin Robinson" href="mailto:mrobinson@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
-<link rel="match" href="content-visibility-fieldset-size-ref.html">
-<meta name="assert" content="A fieldset hiding content with content-visibility should be equivalent to an empty fieldset">
-
-<style>
-fieldset {
-    background: green;
-    content-visibility: hidden
-}
-</style>
-
-<fieldset><legend>Hidden legend content</legend>Hidden fieldset content</fieldset>

toolkit/components/find/nsFind.cpp

@@ -143,8 +143,7 @@ static bool IsVisibleNode(const nsINode* aNode) {
     return true;
   }
 
-  if (frame->HidesContent() ||
-      frame->IsHiddenByContentVisibilityOnAnyAncestor()) {
+  if (frame->IsContentHidden() || frame->AncestorHidesContent()) {
     return false;
   }