Backed out changeset 2feca7f78d58 (bug 1871751) for causing failures at DisplayPortUtils.cpp. CLOSED TREE

layout/base/DisplayPortUtils.cpp

@@ -790,8 +790,8 @@ bool DisplayPortUtils::MaybeCreateDisplayPort(
   // async-scrollable frame (i.e. one that WantsAsyncScroll()) has a
   // displayport. If that's not the case yet, and we are async-scrollable, we
   // will get a displayport.
-  MOZ_ASSERT(nsLayoutUtils::AsyncPanZoomEnabled(aScrollFrame));
   if (!aBuilder->HaveScrollableDisplayPort() &&
+      nsLayoutUtils::AsyncPanZoomEnabled(aScrollFrame) &&
       aScrollFrameAsScrollable->WantAsyncScroll()) {
     bool haveDisplayPort = HasNonMinimalNonZeroDisplayPort(content);
     // If we don't already have a displayport, calculate and set one.

layout/base/nsLayoutUtils.cpp

@@ -3168,8 +3168,7 @@ void nsLayoutUtils::PaintFrame(gfxContext* aRenderingContext, nsIFrame* aFrame,
   }
 
   builder->ClearHaveScrollableDisplayPort();
-  if (builder->IsPaintingToWindow() &&
-      nsLayoutUtils::AsyncPanZoomEnabled(aFrame)) {
+  if (builder->IsPaintingToWindow()) {
     DisplayPortUtils::MaybeCreateDisplayPortInFirstScrollFrameEncountered(
         aFrame, builder);
   }