Bug 1673132 - Remove "scrollbar-small" -moz-default-appearance value and replace its single use with scrollbar-width: thin. r=emilio

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

devtools/shared/css/generated/properties-db.js

@@ -270,7 +270,6 @@ exports.CSS_PROPERTIES = {
       "revert",
       "scrollbar",
       "scrollbar-horizontal",
-      "scrollbar-small",
       "scrollbar-vertical",
       "scrollbarbutton-down",
       "scrollbarbutton-left",
@@ -1581,7 +1580,6 @@ exports.CSS_PROPERTIES = {
       "revert",
       "scrollbar",
       "scrollbar-horizontal",
-      "scrollbar-small",
       "scrollbar-vertical",
       "scrollbarbutton-down",
       "scrollbarbutton-left",
@@ -3431,7 +3429,6 @@ exports.CSS_PROPERTIES = {
       "revert",
       "scrollbar",
       "scrollbar-horizontal",
-      "scrollbar-small",
       "scrollbar-vertical",
       "scrollbarbutton-down",
       "scrollbarbutton-left",

servo/components/style/values/specified/box.rs

@@ -1644,9 +1644,6 @@ pub enum Appearance {
     /// A scrollbar.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Scrollbar,
-    /// A small scrollbar.
-    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
-    ScrollbarSmall,
     /// The scrollbar slider
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ScrollbarHorizontal,

toolkit/themes/osx/global/nativescrollbars.css

@@ -17,10 +17,9 @@ scrollbar[root="true"] {
   z-index: 2147483647; /* largest positive value of a signed 32-bit integer */
 }
 
-html|select[size]:not([size="0"]):not([size="1"]) > scrollbar,
-html|select[multiple] > scrollbar {
-  appearance: auto;
-  -moz-default-appearance: scrollbar-small;
+html|select[size]:not([size="0"]):not([size="1"]),
+html|select[multiple] {
+  scrollbar-width: thin;
 }
 
 @media all and (-moz-overlay-scrollbars) {

widget/ScrollbarDrawingMac.cpp

@@ -35,15 +35,7 @@ static nsIFrame* GetParentScrollbarFrame(nsIFrame* aFrame) {
 
 static bool IsSmallScrollbar(nsIFrame* aFrame) {
   ComputedStyle* style = nsLayoutUtils::StyleForScrollbar(aFrame);
-  if (style->StyleUIReset()->mScrollbarWidth == StyleScrollbarWidth::Thin) {
-    return true;
-  }
-  nsIFrame* scrollbarFrame = GetParentScrollbarFrame(aFrame);
-  if (scrollbarFrame && scrollbarFrame->StyleDisplay()->EffectiveAppearance() ==
-                            StyleAppearance::ScrollbarSmall) {
-    return true;
-  }
-  return false;
+  return style->StyleUIReset()->mScrollbarWidth == StyleScrollbarWidth::Thin;
 }
 
 static bool IsParentScrollbarRolledOver(nsIFrame* aFrame) {
@@ -64,7 +56,6 @@ LayoutDeviceIntSize ScrollbarDrawingMac::GetMinimumWidgetSize(
       case StyleAppearance::ScrollbarthumbVertical:
         return IntSize{0, 26};
       case StyleAppearance::Scrollbar:
-      case StyleAppearance::ScrollbarSmall:
       case StyleAppearance::ScrollbartrackVertical:
       case StyleAppearance::ScrollbartrackHorizontal: {
         if (nsLookAndFeel::GetInt(LookAndFeel::IntID::UseOverlayScrollbars) !=

widget/cocoa/nsNativeThemeCocoa.mm

@@ -2798,7 +2798,6 @@ Maybe<nsNativeThemeCocoa::WidgetInfo> nsNativeThemeCocoa::ComputeWidgetInfo(
       break;
     }
 
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::Scrollbar:
       break;
     case StyleAppearance::ScrollbarthumbVertical:
@@ -3678,7 +3677,6 @@ nsNativeThemeCocoa::GetMinimumWidgetSize(nsPresContext* aPresContext, nsIFrame*
     case StyleAppearance::ScrollbarthumbHorizontal:
     case StyleAppearance::ScrollbarthumbVertical:
     case StyleAppearance::Scrollbar:
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::ScrollbartrackVertical:
     case StyleAppearance::ScrollbartrackHorizontal:
     case StyleAppearance::ScrollbarbuttonUp:
@@ -3862,7 +3860,6 @@ bool nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext, nsIFra
     case StyleAppearance::Range:
 
     case StyleAppearance::Scrollbar:
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::ScrollbarbuttonUp:
     case StyleAppearance::ScrollbarbuttonDown:
     case StyleAppearance::ScrollbarbuttonLeft:
@@ -4044,7 +4041,6 @@ nsITheme::Transparency nsNativeThemeCocoa::GetWidgetTransparency(nsIFrame* aFram
     case StyleAppearance::Dialog:
       return eTransparent;
 
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::Scrollbar:
     case StyleAppearance::Scrollcorner: {
       // We don't use custom scrollbars when using overlay scrollbars.

widget/gtk/nsNativeBasicThemeGTK.cpp

@@ -45,7 +45,6 @@ nsNativeBasicThemeGTK::GetMinimumWidgetSize(nsPresContext* aPresContext,
 
   switch (aAppearance) {
     case StyleAppearance::Scrollbar:
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::ScrollbarVertical:
     case StyleAppearance::ScrollbarHorizontal:
     case StyleAppearance::ScrollbarbuttonUp:

widget/gtk/nsNativeThemeGTK.cpp

@@ -1865,7 +1865,6 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsPresContext* aPresContext,
     case StyleAppearance::SpinnerDownbutton:
     case StyleAppearance::SpinnerTextfield:
       // case StyleAppearance::Scrollbar:  (n/a for gtk)
-      // case StyleAppearance::ScrollbarSmall: (n/a for gtk)
     case StyleAppearance::ScrollbarbuttonUp:
     case StyleAppearance::ScrollbarbuttonDown:
     case StyleAppearance::ScrollbarbuttonLeft:

widget/nsNativeBasicTheme.cpp

@@ -1369,7 +1369,6 @@ nsNativeBasicTheme::GetMinimumWidgetSize(nsPresContext* aPresContext,
           static_cast<uint32_t>(kMinimumSpinnerButtonWidth) * dpiRatio;
       break;
     case StyleAppearance::Scrollbar:
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::ScrollbarVertical:
     case StyleAppearance::ScrollbarHorizontal:
     case StyleAppearance::ScrollbarbuttonUp:

widget/nsNativeTheme.cpp

@@ -659,7 +659,6 @@ bool nsNativeTheme::IsDarkBackground(nsIFrame* aFrame) {
 bool nsNativeTheme::IsWidgetScrollbarPart(StyleAppearance aAppearance) {
   switch (aAppearance) {
     case StyleAppearance::Scrollbar:
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::ScrollbarVertical:
     case StyleAppearance::ScrollbarHorizontal:
     case StyleAppearance::ScrollbarbuttonUp:

widget/windows/nsNativeThemeWin.cpp

@@ -709,7 +709,6 @@ mozilla::Maybe<nsUXThemeClass> nsNativeThemeWin::GetThemeClass(
     case StyleAppearance::Tabpanels:
       return Some(eUXTab);
     case StyleAppearance::Scrollbar:
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::ScrollbarVertical:
     case StyleAppearance::ScrollbarHorizontal:
     case StyleAppearance::ScrollbarbuttonUp:
@@ -1113,7 +1112,6 @@ nsresult nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame,
     case StyleAppearance::MozWinBrowsertabbarToolbox:
     case StyleAppearance::Statusbar:
     case StyleAppearance::Scrollbar:
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::Scrollcorner: {
       aState = 0;
       aPart = RP_BACKGROUND;
@@ -2619,7 +2617,6 @@ nsITheme::Transparency nsNativeThemeWin::GetWidgetTransparency(
   }
 
   switch (aAppearance) {
-    case StyleAppearance::ScrollbarSmall:
     case StyleAppearance::Scrollbar:
     case StyleAppearance::Scrollcorner:
     case StyleAppearance::Statusbar: