Bug 1657822. Enable new desktop zooming scrollbar code. r=kats
☠☠ backed out by 8734082cd6de ☠ ☠
authorTimothy Nikkel <tnikkel@gmail.com>
Thu, 24 Sep 2020 22:09:54 +0000
changeset 550287 78024e47a90119c389b77bf6558949d1c8771ad8
parent 550286 acc569599c8fbfd6c284d87b2a67de9ed968fbcd
child 550288 560fbab616a1a4ac42529f9e5fea1b04e7ae2207
push id127220
push usertnikkel@mozilla.com
push dateFri, 25 Sep 2020 05:29:03 +0000
treeherderautoland@78024e47a901 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1657822
milestone83.0a1
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
Bug 1657822. Enable new desktop zooming scrollbar code. r=kats The mathml reftest pref needs to be added at the same time because the test needs that pref with the new scrollbar code to pass, but it fails with that pref with the old scrollbar code. Since that test uses the minimum scale, which is only valid with overlay scrollbars, it is correct to do so. Differential Revision: https://phabricator.services.mozilla.com/D91243
gfx/thebes/gfxPlatform.cpp
layout/reftests/mathml/reftest.list
modules/libpref/init/StaticPrefList.yaml
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -3208,17 +3208,16 @@ uint32_t gfxPlatform::TargetFrameRate() 
     VsyncSource::Display& display = gPlatform->mVsyncSource->GetGlobalDisplay();
     return round(1000.0 / display.GetVsyncRate().ToMilliseconds());
   }
   return 0;
 }
 
 /* static */
 bool gfxPlatform::UseDesktopZoomingScrollbars() {
-  // bug 1657822 to enable this by default
   return StaticPrefs::apz_allow_zooming() &&
          !StaticPrefs::apz_force_disable_desktop_zooming_scrollbars();
 }
 
 /*static*/
 bool gfxPlatform::AsyncPanZoomEnabled() {
 #if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_UIKIT)
   // For XUL applications (everything but Firefox on Android)
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -360,17 +360,17 @@ pref(mathml.mfrac_linethickness_names.di
 pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview&&webrender,0-239,0-776) == mfrac-C-3.html mfrac-C-3-ref.html
 pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview&&webrender,0-239,0-271) == mfrac-C-4.html mfrac-C-4-ref.html
 pref(mathml.mfrac_bevelled_attribute.disabled,false) fuzzy-if(OSX,0-1,0-100) fuzzy-if(skiaContent,0-1,0-14) == mfrac-D-1.html mfrac-D-1-ref.html
 pref(mathml.mfrac_linethickness_names.disabled,false) == mfrac-D-2.html mfrac-D-2-ref.html
 pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview&&webrender,0-239,0-776) == mfrac-D-3.html mfrac-D-3-ref.html
 pref(mathml.deprecated_alignment_attributes.disabled,false) fuzzy-if(geckoview&&webrender,0-239,0-271) == mfrac-D-4.html mfrac-D-4-ref.html
 == mfrac-E-1.html mfrac-E-1-ref.html
 == shadow-dom-1.html shadow-dom-1-ref.html
-pref(dom.meta-viewport.enabled,true) pref(font.size.inflation.emPerLine,25) fuzzy-if(webrender&&!gtkWidget,0-255,0-324) fuzzy-if(webrender&&gtkWidget,0-255,0-66) == font-inflation-1.html font-inflation-1-ref.html  # gtkWidget due to Bug 1607294
+pref(ui.useOverlayScrollbars,1) pref(dom.meta-viewport.enabled,true) pref(font.size.inflation.emPerLine,25) fuzzy-if(webrender&&!gtkWidget,0-255,0-324) fuzzy-if(webrender&&gtkWidget,0-255,0-66) == font-inflation-1.html font-inflation-1-ref.html  # gtkWidget due to Bug 1607294
 test-pref(font.minimum-size.x-math,40) == default-font.html default-font-ref.html
 != radicalbar-1.html about:blank
 != radicalbar-1a.html about:blank
 != radicalbar-1b.html about:blank
 != radicalbar-1c.html about:blank
 != radicalbar-1d.html about:blank
 != radicalbar-2.html about:blank
 != radicalbar-2a.html about:blank
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -454,17 +454,17 @@
 - name: apz.touch_acceleration_factor_y
   type: float
   value: 1.0f
   mirror: always
 
 # new scrollbar code for desktop zooming
 - name: apz.force_disable_desktop_zooming_scrollbars
   type: RelaxedAtomicBool
-  value: true
+  value: @IS_ANDROID@
   mirror: always
 
 #ifdef MOZ_WIDGET_GTK
 -   name: apz.gtk.kinetic_scroll.enabled
     type: RelaxedAtomicBool
     value: true
     mirror: always
 #endif