Backed out changeset 564081c2d0cd (bug 1652288) for build bustages on nsIFrame.cpp. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Fri, 24 Jul 2020 21:14:42 +0300
changeset 542089 de0b9fd13f535d36aa55b4a87d6e0ab9f279371f
parent 542088 9253b3465e9e57897421f824135c16aa6ba151c6
child 542090 feb3ad4b4a25f6935423d38b95866b0f488e03ff
push id122629
push userncsoregi@mozilla.com
push dateFri, 24 Jul 2020 18:16:40 +0000
treeherderautoland@de0b9fd13f53 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1652288
milestone80.0a1
backs out564081c2d0cdd4a047bf7ac02d786c89313133e2
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 564081c2d0cd (bug 1652288) for build bustages on nsIFrame.cpp. CLOSED TREE
layout/generic/nsIFrame.cpp
--- a/layout/generic/nsIFrame.cpp
+++ b/layout/generic/nsIFrame.cpp
@@ -3845,30 +3845,17 @@ static bool DescendIntoChild(nsDisplayLi
 
   // There are cases where the "ignore scroll frame" on the builder is not set
   // correctly, and so we additionally want to catch cases where the child is
   // a root scrollframe and we are ignoring scrolling on the viewport.
   if (aChild == aBuilder->GetPresShellIgnoreScrollFrame()) {
     return true;
   }
 
-  nsRect overflow = aChild->GetInkOverflowRect();
-
-  // On mobile, there may be a dynamic toolbar. The root content document's
-  // root scroll frame's ink overflow rect does not include the toolbar
-  // height, but if the toolbar is hidden, we still want to be able to target
-  // content underneath the toolbar, so expand the overflow rect here to
-  // allow display list building to descend into the scroll frame.
-  if (aBuilder->IsForEventDelivery() &&
-      aChild == aChild->PresShell()->GetRootScrollFrame() &&
-      aChild->PresContext()->IsRootContentDocumentCrossProcess() &&
-      aChild->PresContext()->HasDynamicToolbar()) {
-    overflow.SizeTo(nsLayoutUtils::ExpandHeightForDynamicToolbar(
-        aChild->PresContext(), overflow.Size()));
-  }
+  const nsRect overflow = aChild->InkOverflowRect();
 
   if (aDirty.Intersects(overflow)) {
     return true;
   }
 
   if (aChild->ForceDescendIntoIfVisible() && aVisible.Intersects(overflow)) {
     return true;
   }