Bug 1771796 - Remove -moz-scrollbar-thumb-proportional. r=dholbert

It unconditionally matches on all platforms, so it's not returning any useful information. Depends on D147689 Differential Revision: https://phabricator.services.mozilla.com/D147690
iaxat · Jun 2, 2022 · b161a8e · b161a8e
1 parent c63e563
commit b161a8e
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 38 deletions.
diff --git a/layout/style/test/chrome/bug418986-2.js b/layout/style/test/chrome/bug418986-2.js
@@ -56,7 +56,6 @@ var suppressed_toggles = [
   "-moz-scrollbar-end-forward",
   "-moz-scrollbar-start-backward",
   "-moz-scrollbar-start-forward",
-  "-moz-scrollbar-thumb-proportional",
   "-moz-windows-compositor",
   "-moz-windows-default-theme",
   "-moz-windows-glass",

diff --git a/layout/style/test/chrome/chrome-only-media-queries.js b/layout/style/test/chrome/chrome-only-media-queries.js
@@ -6,7 +6,6 @@ const CHROME_ONLY_TOGGLES = [
   "-moz-scrollbar-start-forward",
   "-moz-scrollbar-end-backward",
   "-moz-scrollbar-end-forward",
-  "-moz-scrollbar-thumb-proportional",
   "-moz-overlay-scrollbars",
   "-moz-windows-classic",
   "-moz-windows-compositor",

diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs
@@ -586,7 +586,7 @@ macro_rules! bool_pref_feature {
 /// to support new types in these entries and (2) ensuring that either
 /// nsPresContext::MediaFeatureValuesChanged is called when the value that
 /// would be returned by the evaluator function could change.
-pub static MEDIA_FEATURES: [QueryFeatureDescription; 60] = [
+pub static MEDIA_FEATURES: [QueryFeatureDescription; 59] = [
     feature!(
         atom!("width"),
         AllowsRanges::Yes,
@@ -855,10 +855,6 @@ pub static MEDIA_FEATURES: [QueryFeatureDescription; 60] = [
         ScrollArrowStyle,
         get_scrollbar_end_forward
     ),
-    lnf_int_feature!(
-        atom!("-moz-scrollbar-thumb-proportional"),
-        ScrollSliderStyle
-    ),
     lnf_int_feature!(atom!("-moz-menubar-drag"), MenuBarDrag),
     lnf_int_feature!(atom!("-moz-windows-default-theme"), WindowsDefaultTheme),
     lnf_int_feature!(atom!("-moz-mac-graphite-theme"), MacGraphiteTheme),

diff --git a/toolkit/content/minimal-xul.css b/toolkit/content/minimal-xul.css
@@ -176,6 +176,7 @@ resizer[dir="topright"] {
 /********** scrollbar **********/
 
 thumb {
+  -moz-box-flex: 1;
   display: -moz-box !important;
 }
 
@@ -223,9 +224,3 @@ scrollbar[value="hidden"] {
     display: none;
   }
 }
-
-@media (-moz-scrollbar-thumb-proportional) {
-  thumb {
-    -moz-box-flex: 1;
-  }
-}
diff --git a/widget/LookAndFeel.h b/widget/LookAndFeel.h
@@ -75,8 +75,6 @@ class LookAndFeel {
 
     // position of scroll arrows in a scrollbar
     ScrollArrowStyle,
-    // is scroll thumb proportional or fixed?
-    ScrollSliderStyle,
 
     // each button can take one of four values:
     ScrollButtonLeftMouseButtonAction,
@@ -368,8 +366,6 @@ class LookAndFeel {
         eScrollArrow_StartBackward | eScrollArrow_StartForward
   };
 
-  enum { eScrollThumbStyle_Normal, eScrollThumbStyle_Proportional };
-
   // When modifying this list, also modify nsXPLookAndFeel::sFloatPrefs
   // in widget/nsXPLookAndFeel.cpp.
   enum class FloatID {

diff --git a/widget/android/nsLookAndFeel.cpp b/widget/android/nsLookAndFeel.cpp
@@ -334,10 +334,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
       aResult = eScrollArrowStyle_Single;
       break;
 
-    case IntID::ScrollSliderStyle:
-      aResult = eScrollThumbStyle_Proportional;
-      break;
-
     case IntID::UseOverlayScrollbars:
       aResult = 1;
       break;

diff --git a/widget/cocoa/nsLookAndFeel.mm b/widget/cocoa/nsLookAndFeel.mm
@@ -400,9 +400,6 @@ static nscolor GetColorFromNSColorWithCustomAlpha(NSColor* aColor, float alpha)
     case IntID::ScrollArrowStyle:
       aResult = eScrollArrow_None;
       break;
-    case IntID::ScrollSliderStyle:
-      aResult = eScrollThumbStyle_Proportional;
-      break;
     case IntID::UseOverlayScrollbars:
     case IntID::AllowOverlayScrollbarsOverlap:
       aResult = NSScroller.preferredScrollerStyle == NSScrollerStyleOverlay;

diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
@@ -862,9 +862,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
       aResult = ConvertGTKStepperStyleToMozillaScrollArrowStyle(scrollbar);
       break;
     }
-    case IntID::ScrollSliderStyle:
-      aResult = eScrollThumbStyle_Proportional;
-      break;
     case IntID::TreeOpenDelay:
       aResult = 1000;
       break;

diff --git a/widget/headless/HeadlessLookAndFeelGTK.cpp b/widget/headless/HeadlessLookAndFeelGTK.cpp
@@ -63,9 +63,6 @@ nsresult HeadlessLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
     case IntID::ScrollArrowStyle:
       aResult = eScrollArrow_None;
       break;
-    case IntID::ScrollSliderStyle:
-      aResult = eScrollThumbStyle_Proportional;
-      break;
     case IntID::ScrollButtonLeftMouseButtonAction:
       aResult = 0;
       return NS_OK;

diff --git a/widget/nsXPLookAndFeel.cpp b/widget/nsXPLookAndFeel.cpp
@@ -125,7 +125,6 @@ static const char sIntPrefs[][45] = {
     "ui.dragThresholdY",
     "ui.useAccessibilityTheme",
     "ui.scrollArrowStyle",
-    "ui.scrollSliderStyle",
     "ui.scrollButtonLeftMouseButtonAction",
     "ui.scrollButtonMiddleMouseButtonAction",
     "ui.scrollButtonRightMouseButtonAction",

diff --git a/widget/uikit/nsLookAndFeel.mm b/widget/uikit/nsLookAndFeel.mm
@@ -274,9 +274,6 @@ static nscolor GetColorFromUIColor(UIColor* aColor) {
     case IntID::ScrollArrowStyle:
       aResult = eScrollArrow_None;
       break;
-    case IntID::ScrollSliderStyle:
-      aResult = eScrollThumbStyle_Proportional;
-      break;
     case IntID::TreeOpenDelay:
       aResult = 1000;
       break;

diff --git a/widget/windows/nsLookAndFeel.cpp b/widget/windows/nsLookAndFeel.cpp
@@ -384,9 +384,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
     case IntID::ScrollArrowStyle:
       aResult = eScrollArrowStyle_Single;
       break;
-    case IntID::ScrollSliderStyle:
-      aResult = eScrollThumbStyle_Proportional;
-      break;
     case IntID::TreeOpenDelay:
       aResult = 1000;
       break;

diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
@@ -2224,7 +2224,6 @@
     Atom("_moz_scrollbar_start_forward", "-moz-scrollbar-start-forward"),
     Atom("_moz_scrollbar_end_backward", "-moz-scrollbar-end-backward"),
     Atom("_moz_scrollbar_end_forward", "-moz-scrollbar-end-forward"),
-    Atom("_moz_scrollbar_thumb_proportional", "-moz-scrollbar-thumb-proportional"),
     Atom("_moz_overlay_scrollbars", "-moz-overlay-scrollbars"),
     Atom("_moz_windows_accent_color_in_titlebar", "-moz-windows-accent-color-in-titlebar"),
     Atom("_moz_windows_default_theme", "-moz-windows-default-theme"),