From 2a3847037c29d42fcdd2b03b1d8ca04dda1f644f Mon Sep 17 00:00:00 2001 From: Gurzau Raul Date: Fri, 21 Sep 2018 03:31:24 +0300 Subject: [PATCH] Backed out changeset 471ccb1a377e (bug 1492250) for failing at /reftests/async-scrolling/reftest.list line 36 on a CLOSED TREE --- layout/painting/nsDisplayList.cpp | 7 +--- layout/reftests/async-scrolling/reftest.list | 1 - .../sticky-pos-scrollable-7-ref.html | 28 ------------- .../sticky-pos-scrollable-7.html | 42 ------------------- 4 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 layout/reftests/async-scrolling/sticky-pos-scrollable-7-ref.html delete mode 100644 layout/reftests/async-scrolling/sticky-pos-scrollable-7.html diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp index e56d5c4360e6..c7c3ba939890 100644 --- a/layout/painting/nsDisplayList.cpp +++ b/layout/painting/nsDisplayList.cpp @@ -7772,11 +7772,8 @@ nsDisplayStickyPosition::CreateWebRenderCommands( aManager->CommandBuilder().PushOverrideForASR(mContainerASR, Some(id)); } - { - StackingContextHelper sc(aSc, aBuilder); - nsDisplayWrapList::CreateWebRenderCommands( - aBuilder, aResources, sc, aManager, aDisplayListBuilder); - } + nsDisplayOwnLayer::CreateWebRenderCommands( + aBuilder, aResources, aSc, aManager, aDisplayListBuilder); if (stickyScrollContainer) { aManager->CommandBuilder().PopOverrideForASR(mContainerASR); diff --git a/layout/reftests/async-scrolling/reftest.list b/layout/reftests/async-scrolling/reftest.list index d4243d85a884..e52e85e2d2e6 100644 --- a/layout/reftests/async-scrolling/reftest.list +++ b/layout/reftests/async-scrolling/reftest.list @@ -33,7 +33,6 @@ skip-if(!asyncPan) == sticky-pos-scrollable-3.html sticky-pos-scrollable-3-ref.h skip-if(!asyncPan) == sticky-pos-scrollable-4.html sticky-pos-scrollable-4-ref.html skip-if(!asyncPan) == sticky-pos-scrollable-5.html sticky-pos-scrollable-5-ref.html skip-if(!asyncPan) == sticky-pos-scrollable-6.html sticky-pos-scrollable-6-ref.html -skip-if(!asyncPan||Android) == sticky-pos-scrollable-7.html sticky-pos-scrollable-7-ref.html // Bug 1430787 for the Android failure skip-if(!asyncPan) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1-ref.html skip-if(!asyncPan) == culling-1.html culling-1-ref.html skip-if(!asyncPan) == position-fixed-iframe-1.html position-fixed-iframe-1-ref.html diff --git a/layout/reftests/async-scrolling/sticky-pos-scrollable-7-ref.html b/layout/reftests/async-scrolling/sticky-pos-scrollable-7-ref.html deleted file mode 100644 index 92105b51f2da..000000000000 --- a/layout/reftests/async-scrolling/sticky-pos-scrollable-7-ref.html +++ /dev/null @@ -1,28 +0,0 @@ - - - -
- -
- diff --git a/layout/reftests/async-scrolling/sticky-pos-scrollable-7.html b/layout/reftests/async-scrolling/sticky-pos-scrollable-7.html deleted file mode 100644 index 44fc33e4ce15..000000000000 --- a/layout/reftests/async-scrolling/sticky-pos-scrollable-7.html +++ /dev/null @@ -1,42 +0,0 @@ - - - -
- -
-
-