Bug 1561825 - followup: Fix merge bustage since this conflicted with bug 1561929, which landed on autoland.
authorEmilio Cobos Álvarez <emilio@crisal.io>
Fri, 28 Jun 2019 13:19:18 +0200
changeset 480656 6c6b0bbf5885493a0b85cedf1985d6eb3bdbfe6f
parent 480655 499f00f48b798f82d23e07caaf4f6df2143e24f9
child 480657 5a18f5c929ab13bde25f7fff8ae72f87e8fa379c
push id36217
push userncsoregi@mozilla.com
push dateSat, 29 Jun 2019 10:00:32 +0000
treeherdermozilla-central@84318ef3fa4f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1561825, 1561929
milestone69.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 1561825 - followup: Fix merge bustage since this conflicted with bug 1561929, which landed on autoland. CLOSED TREE
modules/libpref/init/StaticPrefList.h
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -7164,17 +7164,17 @@ VARCACHE_PREF(
 //---------------------------------------------------------------------------
 
 // Scrollbar snapping region.
 // - 0: off
 // - 1 and higher: slider thickness multiple
 VARCACHE_PREF(
   Once,
   "slider.snapMultiplier",
-  SliderSnapMultiplier,
+   slider_snapMultiplier,
   int32_t,
 #ifdef XP_WIN
   6
 #else
   0
 #endif
 )