diff --git a/gfx/layers/apz/test/mochitest/helper_scrollbartrack_click_overshoot.html b/gfx/layers/apz/test/mochitest/helper_scrollbartrack_click_overshoot.html index 5880f91b1769..7ee9f3f052c9 100644 --- a/gfx/layers/apz/test/mochitest/helper_scrollbartrack_click_overshoot.html +++ b/gfx/layers/apz/test/mochitest/helper_scrollbartrack_click_overshoot.html @@ -69,13 +69,18 @@ async function test() { }); } -// Note: on Linux, if the gtk-primary-button-warps-slider setting -// is enabled, this test will not exercise the codepath it intends -// to test (the thumb will jump immediately under the cursor, causing -// the test to pass trivially). However, the test should still not fail. -waitUntilApzStable() -.then(test) -.then(subtestDone, subtestFailed); +if (getPlatform() == "mac") { + ok(true, "Skipping test on Mac (bug 1851423)"); + subtestDone(); +} else { + // Note: on Linux, if the gtk-primary-button-warps-slider setting + // is enabled, this test will not exercise the codepath it intends + // to test (the thumb will jump immediately under the cursor, causing + // the test to pass trivially). However, the test should still not fail. + waitUntilApzStable() + .then(test) + .then(subtestDone, subtestFailed); +} diff --git a/layout/xul/nsSliderFrame.cpp b/layout/xul/nsSliderFrame.cpp index 3d2958f6a656..fc6e77cd2722 100644 --- a/layout/xul/nsSliderFrame.cpp +++ b/layout/xul/nsSliderFrame.cpp @@ -1564,7 +1564,7 @@ void nsSliderFrame::PageScroll(bool aClickAndHold) { sf->ScrollTo(pos, StaticPrefs::general_smoothScroll() && StaticPrefs::general_smoothScroll_pages() - ? ScrollMode::SmoothMsd + ? ScrollMode::Smooth : ScrollMode::Instant, nullptr, scrollSnapFlags);