diff --git a/servo/components/style/values/specified/box.rs b/servo/components/style/values/specified/box.rs index 46d33f3d36f3..d0db3d5d1b61 100644 --- a/servo/components/style/values/specified/box.rs +++ b/servo/components/style/values/specified/box.rs @@ -1502,10 +1502,6 @@ pub enum Appearance { #[parse(condition = "ParserContext::chrome_rules_enabled")] ButtonArrowDown, #[parse(condition = "ParserContext::chrome_rules_enabled")] - ButtonArrowNext, - #[parse(condition = "ParserContext::chrome_rules_enabled")] - ButtonArrowPrevious, - #[parse(condition = "ParserContext::chrome_rules_enabled")] ButtonArrowUp, /// Menu Popup background. #[parse(condition = "ParserContext::chrome_rules_enabled")] diff --git a/widget/gtk/gtk3drawing.cpp b/widget/gtk/gtk3drawing.cpp index 90702d95a20b..2476e994cdd7 100644 --- a/widget/gtk/gtk3drawing.cpp +++ b/widget/gtk/gtk3drawing.cpp @@ -774,20 +774,7 @@ static gint moz_gtk_arrow_paint(cairo_t* cr, GdkRectangle* rect, GdkRectangle arrow_rect; gdouble arrow_angle; - if (direction == GTK_TEXT_DIR_RTL) { - if (arrow_type == GTK_ARROW_LEFT) { - arrow_type = GTK_ARROW_RIGHT; - } else if (arrow_type == GTK_ARROW_RIGHT) { - arrow_type = GTK_ARROW_LEFT; - } - } switch (arrow_type) { - case GTK_ARROW_LEFT: - arrow_angle = ARROW_LEFT; - break; - case GTK_ARROW_RIGHT: - arrow_angle = ARROW_RIGHT; - break; case GTK_ARROW_DOWN: arrow_angle = ARROW_DOWN; break; diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/widget/gtk/nsNativeThemeGTK.cpp index 28443d1c9427..cae161505a44 100644 --- a/widget/gtk/nsNativeThemeGTK.cpp +++ b/widget/gtk/nsNativeThemeGTK.cpp @@ -266,18 +266,12 @@ bool nsNativeThemeGTK::GetGtkWidgetAndState(StyleAppearance aAppearance, case StyleAppearance::ToolbarbuttonDropdown: case StyleAppearance::ButtonArrowDown: case StyleAppearance::ButtonArrowUp: - case StyleAppearance::ButtonArrowNext: - case StyleAppearance::ButtonArrowPrevious: aGtkWidgetType = MOZ_GTK_TOOLBARBUTTON_ARROW; if (aWidgetFlags) { *aWidgetFlags = GTK_ARROW_DOWN; if (aAppearance == StyleAppearance::ButtonArrowUp) *aWidgetFlags = GTK_ARROW_UP; - else if (aAppearance == StyleAppearance::ButtonArrowNext) - *aWidgetFlags = GTK_ARROW_RIGHT; - else if (aAppearance == StyleAppearance::ButtonArrowPrevious) - *aWidgetFlags = GTK_ARROW_LEFT; } break; case StyleAppearance::ProgressBar: @@ -853,8 +847,6 @@ bool nsNativeThemeGTK::GetWidgetPadding(nsDeviceContext* aContext, case StyleAppearance::ToolbarbuttonDropdown: case StyleAppearance::ButtonArrowUp: case StyleAppearance::ButtonArrowDown: - case StyleAppearance::ButtonArrowNext: - case StyleAppearance::ButtonArrowPrevious: case StyleAppearance::RangeThumb: aResult->SizeTo(0, 0, 0, 0); return true; @@ -942,9 +934,7 @@ LayoutDeviceIntSize nsNativeThemeGTK::GetMinimumWidgetSize( } break; case StyleAppearance::ToolbarbuttonDropdown: case StyleAppearance::ButtonArrowUp: - case StyleAppearance::ButtonArrowDown: - case StyleAppearance::ButtonArrowNext: - case StyleAppearance::ButtonArrowPrevious: { + case StyleAppearance::ButtonArrowDown: { moz_gtk_get_arrow_size(MOZ_GTK_TOOLBARBUTTON_ARROW, &result.width, &result.height); } break; @@ -1037,8 +1027,6 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsPresContext* aPresContext, case StyleAppearance::ToolbarbuttonDropdown: case StyleAppearance::ButtonArrowUp: case StyleAppearance::ButtonArrowDown: - case StyleAppearance::ButtonArrowNext: - case StyleAppearance::ButtonArrowPrevious: case StyleAppearance::Listbox: case StyleAppearance::ProgressBar: case StyleAppearance::Progresschunk: @@ -1068,10 +1056,9 @@ nsNativeThemeGTK::WidgetIsContainer(StyleAppearance aAppearance) { // XXXdwh At some point flesh all of this out. if (aAppearance == StyleAppearance::RangeThumb || aAppearance == StyleAppearance::ButtonArrowUp || - aAppearance == StyleAppearance::ButtonArrowDown || - aAppearance == StyleAppearance::ButtonArrowNext || - aAppearance == StyleAppearance::ButtonArrowPrevious) + aAppearance == StyleAppearance::ButtonArrowDown) { return false; + } return true; } diff --git a/widget/nsNativeTheme.cpp b/widget/nsNativeTheme.cpp index dc183438c4bd..3495ff8725c8 100644 --- a/widget/nsNativeTheme.cpp +++ b/widget/nsNativeTheme.cpp @@ -54,8 +54,6 @@ NS_IMPL_ISUPPORTS(nsNativeTheme, nsITimerCallback, nsINamed) if (aAppearance == StyleAppearance::Checkbox || aAppearance == StyleAppearance::Radio || aAppearance == StyleAppearance::ToolbarbuttonDropdown || - aAppearance == StyleAppearance::ButtonArrowPrevious || - aAppearance == StyleAppearance::ButtonArrowNext || aAppearance == StyleAppearance::ButtonArrowUp || #ifdef MOZ_WIDGET_GTK aAppearance == StyleAppearance::MozWindowButtonClose ||