Backed out changeset d4b7dbc0379f (bug 1520301) for reftest failures on gfx/tests/reftest/1519754.html.
authorCosmin Sabou <csabou@mozilla.com>
Thu, 17 Jan 2019 02:40:32 +0200
changeset 514182 e3cb5a5ef667973b60314b67e13184f5d9cedb18
parent 514181 b88b9b479e6369ffba51abf4d6e4d6844da5002c
child 514208 347b8151960cc293c35ec28aeec85fb74a174c05
child 514216 ef3912c3403b4b99af5e2188eb44f9ca067ebf1c
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1520301, 1519754
milestone66.0a1
backs outd4b7dbc0379f7166366dea5fcd45200ffc065c25
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 d4b7dbc0379f (bug 1520301) for reftest failures on gfx/tests/reftest/1519754.html.
gfx/tests/reftest/1519754-ref.html
gfx/tests/reftest/1519754.html
gfx/tests/reftest/reftest.list
gfx/webrender_bindings/WebRenderAPI.cpp
deleted file mode 100644
--- a/gfx/tests/reftest/1519754-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<body style="margin-left: 0px">
-<div style="margin-left: 200px; width: 200px; height: 100px; overflow: auto;">
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-</div>
-</body>
deleted file mode 100644
--- a/gfx/tests/reftest/1519754.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<body>
-<div style="left: 400px; position: fixed; transform: translateX(-200px); width: 200px; height: 100px; overflow: auto;">
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-    XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-</div>
-</body>
--- a/gfx/tests/reftest/reftest.list
+++ b/gfx/tests/reftest/reftest.list
@@ -11,9 +11,8 @@ fuzzy(0-100,0-30) == 1149923.html 114992
 == 1424673.html 1424673-ref.html
 == 1429411.html 1429411-ref.html
 == 1435143.html 1435143-ref.html
 == 1444904.html 1444904-ref.html
 == 1451168.html 1451168-ref.html
 == 1461313.html 1461313-ref.html
 fuzzy(5-32,21908-26621) fuzzy-if(webrender,0-1,0-3) == 1463802.html 1463802-ref.html
 fuzzy(0-11,0-4) == 1474722.html 1474722-ref.html
-fuzzy(0-50,0-10000) == 1519754.html 1519754-ref.html
--- a/gfx/webrender_bindings/WebRenderAPI.cpp
+++ b/gfx/webrender_bindings/WebRenderAPI.cpp
@@ -792,23 +792,20 @@ wr::WrSpaceAndClip DisplayListBuilder::D
     const layers::ScrollableLayerGuid::ViewID& aViewId,
     const Maybe<wr::WrSpaceAndClip>& aParent,
     const wr::LayoutRect& aContentRect, const wr::LayoutRect& aClipRect) {
   auto it = mScrollIds.find(aViewId);
   if (it != mScrollIds.end()) {
     return it->second;
   }
 
+  auto rootSpaceAndClip = wr::RootScrollNode();
   // We haven't defined aViewId before, so let's define it now.
-  wr::WrSpaceAndClip defaultParent = wr::RootScrollNode();
-  //Note: we are currently ignoring the clipId on the stack here
-  defaultParent.space = mCurrentSpaceAndClipChain.space;
-
   auto spaceAndClip = wr_dp_define_scroll_layer(
-      mWrState, aViewId, aParent ? aParent.ptr() : &defaultParent,
+      mWrState, aViewId, aParent ? aParent.ptr() : &rootSpaceAndClip,
       aContentRect, aClipRect);
 
   WRDL_LOG("DefineScrollLayer id=%" PRIu64 "/%zu p=%s co=%s cl=%s\n", mWrState,
            aViewId, spaceAndClip.space.id,
            aParent ? Stringify(aParent->space.id).c_str() : "(nil)",
            Stringify(aContentRect).c_str(), Stringify(aClipRect).c_str());
 
   mScrollIds[aViewId] = spaceAndClip;