Bug 1137890 - Let containerless scrolling ride the trains. r=kats

Differential Revision: https://phabricator.services.mozilla.com/D23370

--HG--
extra : moz-landing-system : lando

layout/reftests/bugs/reftest.list

@@ -1919,13 +1919,13 @@ pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-h.html 1133905-ref-h
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-4-h.html 1133905-ref-h.html
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-5-h.html 1133905-ref-h.html
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-6-h.html 1133905-ref-h.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-1-vh.html 1133905-ref-vh.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-2-vh.html 1133905-ref-vh.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) == 1133905-3-vh.html 1133905-ref-vh.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-4-vh.html 1133905-ref-vh.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-5-vh.html 1133905-ref-vh.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fuzzy-if(Android,0-54,0-8) == 1133905-6-vh.html 1133905-ref-vh.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) != 1133905-ref-vh.html about:blank # make sure it doesn't render blank
+pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-1-vh.html 1133905-ref-vh.html
+pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-2-vh.html 1133905-ref-vh.html
+pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-vh.html 1133905-ref-vh.html
+pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-4-vh.html 1133905-ref-vh.html
+pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-5-vh.html 1133905-ref-vh.html
+pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-8) == 1133905-6-vh.html 1133905-ref-vh.html
+pref(apz.allow_zooming,true) skip-if(!Android) != 1133905-ref-vh.html about:blank # make sure it doesn't render blank
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-1-rtl.html 1133905-ref-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-2-rtl.html 1133905-ref-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-rtl.html 1133905-ref-rtl.html
@@ -1944,13 +1944,13 @@ pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-h-rtl.html 1133905-r
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-4-h-rtl.html 1133905-ref-h-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-5-h-rtl.html 1133905-ref-h-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-6-h-rtl.html 1133905-ref-h-rtl.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-1-vh-rtl.html 1133905-ref-vh-rtl.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-2-vh-rtl.html 1133905-ref-vh-rtl.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) == 1133905-3-vh-rtl.html 1133905-ref-vh-rtl.html
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fails-if(Android) == 1133905-4-vh-rtl.html 1133905-ref-vh-rtl.html # bug 1527511
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fails-if(Android) == 1133905-5-vh-rtl.html 1133905-ref-vh-rtl.html # bug 1527511
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) fails-if(Android) == 1133905-6-vh-rtl.html 1133905-ref-vh-rtl.html # bug 1527511
-pref(apz.allow_zooming,true) pref(layout.scroll.root-frame-containers,0) skip-if(!Android) != 1133905-ref-vh-rtl.html about:blank # make sure it doesn't render blank
+pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-1-vh-rtl.html 1133905-ref-vh-rtl.html
+pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-2-vh-rtl.html 1133905-ref-vh-rtl.html
+pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-vh-rtl.html 1133905-ref-vh-rtl.html
+pref(apz.allow_zooming,true) skip-if(!Android) fails-if(Android) == 1133905-4-vh-rtl.html 1133905-ref-vh-rtl.html # bug 1527511
+pref(apz.allow_zooming,true) skip-if(!Android) fails-if(Android) == 1133905-5-vh-rtl.html 1133905-ref-vh-rtl.html # bug 1527511
+pref(apz.allow_zooming,true) skip-if(!Android) fails-if(Android) == 1133905-6-vh-rtl.html 1133905-ref-vh-rtl.html # bug 1527511
+pref(apz.allow_zooming,true) skip-if(!Android) != 1133905-ref-vh-rtl.html about:blank # make sure it doesn't render blank
 == 1149304-1-transform-change.html 1149304-1-transform-change-ref.html
 == 1150021-1.xul 1150021-1-ref.xul
 == 1151145-1.html 1151145-1-ref.html

layout/reftests/webm-video/reftest.list

@@ -24,8 +24,8 @@ fails-if(Android) skip-if(Android&&AndroidVersion=='18') == poster-2.html poster
 random-if(Android) == poster-3.html poster-ref-black140x100.html
 == poster-4.html poster-ref-black140x100.html
 random-if(Android) == poster-5.html poster-ref-black140x100.html
-fails-if(Android&&!release_or_beta) == poster-6.html poster-ref-black140x100.html
-fails-if(Android&&!release_or_beta) == poster-7.html poster-ref-red140x100.html
+fails-if(Android) == poster-6.html poster-ref-black140x100.html
+fails-if(Android) == poster-7.html poster-ref-red140x100.html
 fuzzy-if(Android,0-2,0-14000) == poster-8.html poster-ref-black140x100.html
 random == poster-10.html poster-ref-blue125x100.html
 random == poster-11.html poster-ref-blue140x100.html

mobile/android/app/geckoview-prefs.js

@@ -29,15 +29,8 @@ pref("geckoview.logging", "Debug");
 // Disable Web Push until we get it working
 pref("dom.push.enabled", false);
 
-// Use containerless scrolling on the Nightly channel.
-// Bug 1137890 tracks letting it ride the trains.
-// For now, on non-Nightly channels we use containerless scrolling with
-// WebRender only (that's what the "2" means).
-#ifdef NIGHTLY_BUILD
+// Use containerless scrolling.
 pref("layout.scroll.root-frame-containers", 0);
-#else
-pref("layout.scroll.root-frame-containers", 2);
-#endif
 
 // Inherit locale from the OS, used for multi-locale builds
 pref("intl.locale.requested", "");

mobile/android/app/mobile.js

@@ -538,13 +538,8 @@ pref("layers.low-precision-opacity", "1.0");
 // work harder keep scrolling smooth and memory low.
 pref("layers.max-active", 20);
 
-// Use containerless scrolling in nightly builds on Fennec.
-// Bug 1137890 tracks letting containerless scrolling ride the trains.
-#ifdef NIGHTLY_BUILD
+// Use containerless scrolling on Fennec.
 pref("layout.scroll.root-frame-containers", 0);
-#else
-pref("layout.scroll.root-frame-containers", 1);
-#endif
 
 pref("notification.feature.enabled", true);
 pref("dom.webnotifications.enabled", true);