From 41b5455c64a9e89129d97beb7a578f55e263514343522cd3dd6154a61cd655f9 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 27 Apr 2016 23:32:34 +0000 Subject: [PATCH] Accepting request 391871 from home:badshah400:firefox-gtk3 Update gtk3 patch so that if applies against ffx 46.0. OBS-URL: https://build.opensuse.org/request/show/391871 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=502 --- MozillaFirefox.changes | 6 ++ mozilla-gtk3_20.patch | 212 +++++++++++++++++++---------------------- 2 files changed, 102 insertions(+), 116 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 6662977..c8d7963 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 27 08:39:28 UTC 2016 - badshah400@gmail.com + +- Update mozilla-gtk3_20.patch for Firefox 46.0 (sync to latest + version from Fedora). + ------------------------------------------------------------------- Wed Apr 27 06:09:30 UTC 2016 - wr@rosenauer.org diff --git a/mozilla-gtk3_20.patch b/mozilla-gtk3_20.patch index a9e4e32..b979cf4 100644 --- a/mozilla-gtk3_20.patch +++ b/mozilla-gtk3_20.patch @@ -1,6 +1,6 @@ -diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/gtk/gtk3drawing.c ---- firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 2016-04-08 01:55:04.000000000 +0200 -+++ firefox-45.0.2/widget/gtk/gtk3drawing.c 2016-04-20 18:49:52.897795872 +0200 +diff -up firefox-46.0/widget/gtk/gtk3drawing.c.gtk3-20 firefox-46.0/widget/gtk/gtk3drawing.c +--- firefox-46.0/widget/gtk/gtk3drawing.c.gtk3-20 2016-04-22 02:37:27.000000000 +0200 ++++ firefox-46.0/widget/gtk/gtk3drawing.c 2016-04-25 14:56:19.006992927 +0200 @@ -17,32 +17,79 @@ #include @@ -372,7 +372,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g } if (gComboBoxEntryButtonWidget) { -@@ -528,9 +719,21 @@ ensure_tab_widget() +@@ -530,9 +721,21 @@ ensure_tab_widget() static gint ensure_progress_widget() { @@ -397,7 +397,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g } return MOZ_GTK_SUCCESS; } -@@ -636,6 +839,11 @@ static gint +@@ -638,6 +841,11 @@ static gint ensure_check_menu_item_widget() { if (!gCheckMenuItemWidget) { @@ -409,7 +409,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g ensure_menu_popup_widget(); gCheckMenuItemWidget = gtk_check_menu_item_new_with_label("M"); gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget), -@@ -757,7 +965,7 @@ moz_gtk_checkbox_get_metrics(gint* indic +@@ -752,7 +960,7 @@ moz_gtk_checkbox_get_metrics(gint* indic { ensure_checkbox_widget(); @@ -418,7 +418,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g "indicator_size", indicator_size, "indicator_spacing", indicator_spacing, NULL); -@@ -770,7 +978,7 @@ moz_gtk_radio_get_metrics(gint* indicato +@@ -765,7 +973,7 @@ moz_gtk_radio_get_metrics(gint* indicato { ensure_radiobutton_widget(); @@ -427,7 +427,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g "indicator_size", indicator_size, "indicator_spacing", indicator_spacing, NULL); -@@ -783,13 +991,12 @@ moz_gtk_get_focus_outline_size(gint* foc +@@ -778,13 +986,12 @@ moz_gtk_get_focus_outline_size(gint* foc { GtkBorder border; GtkBorder padding; @@ -444,7 +444,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g *focus_h_width = border.left + padding.left; *focus_v_width = border.top + padding.top; return MOZ_GTK_SUCCESS; -@@ -826,7 +1033,7 @@ moz_gtk_button_get_default_overflow(gint +@@ -821,7 +1028,7 @@ moz_gtk_button_get_default_overflow(gint GtkBorder* default_outside_border; ensure_button_widget(); @@ -453,7 +453,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g "default-outside-border", &default_outside_border, NULL); -@@ -849,7 +1056,7 @@ moz_gtk_button_get_default_border(gint* +@@ -844,7 +1051,7 @@ moz_gtk_button_get_default_border(gint* GtkBorder* default_border; ensure_button_widget(); @@ -462,7 +462,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g "default-border", &default_border, NULL); -@@ -940,7 +1147,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec +@@ -935,7 +1142,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec if (state->focused) { GtkBorder border; @@ -471,7 +471,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g x += border.left; y += border.top; width -= (border.left + border.right); -@@ -961,15 +1168,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec +@@ -956,15 +1163,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec gint indicator_size, indicator_spacing; gint x, y, width, height; gint focus_x, focus_y, focus_width, focus_height; @@ -490,7 +490,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g } // XXX we should assert rect->height >= indicator_size too -@@ -988,11 +1194,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec +@@ -983,11 +1189,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec focus_width = width + 2 * indicator_spacing; focus_height = height + 2 * indicator_spacing; @@ -505,7 +505,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g if (selected) state_flags |= checkbox_check_state; -@@ -1000,13 +1204,15 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec +@@ -995,13 +1199,15 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec if (inconsistent) state_flags |= GTK_STATE_FLAG_INCONSISTENT; @@ -525,7 +525,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g focus_width, focus_height); } } -@@ -1015,15 +1221,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec +@@ -1010,15 +1216,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec * 'indeterminate' type on checkboxes. In GTK, the shadow type * must also be changed for the state to be drawn. */ @@ -545,7 +545,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g return MOZ_GTK_SUCCESS; } -@@ -1040,8 +1245,8 @@ calculate_button_inner_rect(GtkWidget* b +@@ -1035,8 +1240,8 @@ calculate_button_inner_rect(GtkWidget* b style = gtk_widget_get_style_context(button); /* This mirrors gtkbutton's child positioning */ @@ -556,7 +556,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g inner_rect->x = rect->x + border.left + padding.left; inner_rect->y = rect->y + padding.top + border.top; -@@ -1107,9 +1312,9 @@ moz_gtk_scrollbar_button_paint(cairo_t * +@@ -1099,9 +1304,9 @@ moz_gtk_scrollbar_button_paint(cairo_t * ensure_scrollbar_widget(); if (flags & MOZ_GTK_STEPPER_VERTICAL) @@ -568,7 +568,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g gtk_widget_set_direction(scrollbar, direction); -@@ -1175,26 +1380,23 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW +@@ -1181,25 +1386,22 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW GtkTextDirection direction) { GtkStyleContext* style; @@ -576,21 +576,13 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g ensure_scrollbar_widget(); -- if (widget == MOZ_GTK_SCROLLBAR_TRACK_HORIZONTAL) +- if (widget == MOZ_GTK_SCROLLBAR_HORIZONTAL) - scrollbar = GTK_SCROLLBAR(gHorizScrollbarWidget); - else - scrollbar = GTK_SCROLLBAR(gVertScrollbarWidget); - - gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction); -+ if (widget == MOZ_GTK_SCROLLBAR_TRACK_HORIZONTAL) { -+ gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction); -+ style = gHorizScrollbar.scroll.style; -+ } -+ else { -+ gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction); -+ style = gVertScrollbar.scroll.style; -+ } - +- if (flags & MOZ_GTK_TRACK_OPAQUE) { style = gtk_widget_get_style_context(GTK_WIDGET(gProtoWindow)); gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); @@ -599,11 +591,18 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g - style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar)); - gtk_style_context_save(style); - gtk_style_context_add_class(style, GTK_STYLE_CLASS_TROUGH); -- ++ if (widget == MOZ_GTK_SCROLLBAR_HORIZONTAL) { ++ gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction); ++ style = gHorizScrollbar.scroll.style; ++ } ++ else { ++ gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction); ++ style = gVertScrollbar.scroll.style; ++ } + gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); - -@@ -1202,7 +1404,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW +@@ -1208,7 +1410,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW gtk_render_focus(style, cr, rect->x, rect->y, rect->width, rect->height); } @@ -611,12 +610,11 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g return MOZ_GTK_SUCCESS; } -@@ -1214,25 +1415,21 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi +@@ -1220,24 +1421,20 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi { GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); GtkStyleContext* style; - GtkScrollbar *scrollbar; - GtkAdjustment *adj; GtkBorder margin; ensure_scrollbar_widget(); @@ -635,7 +633,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g + gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction); + } + else { -+ style = gVertScrollbar.scroll.styleSlider; ++ style = gVertScrollbar.scroll.styleSlider; + gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction); + } @@ -645,7 +643,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g gtk_style_context_get_margin (style, state_flags, &margin); gtk_render_slider(style, cr, -@@ -1243,8 +1440,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi +@@ -1248,8 +1445,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); @@ -654,7 +652,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g return MOZ_GTK_SUCCESS; } -@@ -1255,8 +1450,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta +@@ -1260,8 +1455,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta GtkStyleContext* style; ensure_spin_widget(); @@ -665,7 +663,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g gtk_style_context_save(style); gtk_style_context_add_class(style, GTK_STYLE_CLASS_SPINBUTTON); gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); -@@ -1275,11 +1470,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G +@@ -1280,11 +1475,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G GtkStyleContext* style; ensure_spin_widget(); @@ -679,7 +677,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); -@@ -1445,15 +1639,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec +@@ -1450,15 +1644,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec static gint moz_gtk_entry_paint(cairo_t *cr, GdkRectangle* rect, GtkWidgetState* state, @@ -698,7 +696,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g if (draw_focus_outline_only) { // Inflate the given 'rect' with the focus outline size. -@@ -1473,10 +1665,9 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect +@@ -1478,10 +1670,9 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect * textarea window uses gtk_paint_flat_box when exposed */ /* This gets us a lovely greyish disabledish look */ @@ -710,7 +708,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g /* Now paint the shadow and focus border. * We do like in gtk_entry_draw_frame, we first draw the shadow, a tad -@@ -1526,7 +1717,7 @@ moz_gtk_treeview_paint(cairo_t *cr, GdkR +@@ -1531,7 +1722,7 @@ moz_gtk_treeview_paint(cairo_t *cr, GdkR style = gtk_widget_get_style_context(gScrolledWindowWidget); gtk_style_context_save(style); gtk_style_context_add_class(style, GTK_STYLE_CLASS_FRAME); @@ -719,7 +717,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g xthickness = border.left; ythickness = border.top; -@@ -1697,7 +1888,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk +@@ -1702,7 +1893,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk if (direction == GTK_TEXT_DIR_LTR) { GtkBorder padding; GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); @@ -728,7 +726,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g arrow_rect.x -= padding.left; } else -@@ -1799,29 +1990,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk +@@ -1804,29 +1995,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk gboolean isradio, GtkTextDirection direction) { GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); @@ -766,7 +764,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g return MOZ_GTK_SUCCESS; } -@@ -1831,32 +2020,26 @@ moz_gtk_toggle_label_paint(cairo_t *cr, +@@ -1836,32 +2025,26 @@ moz_gtk_toggle_label_paint(cairo_t *cr, GtkWidgetState* state, gboolean isradio, GtkTextDirection direction) { @@ -808,7 +806,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g return MOZ_GTK_SUCCESS; } -@@ -1917,7 +2100,7 @@ moz_gtk_toolbar_separator_paint(cairo_t +@@ -1922,7 +2105,7 @@ moz_gtk_toolbar_separator_paint(cairo_t rect->height * (end_fraction - start_fraction)); } else { GtkBorder padding; @@ -817,7 +815,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g paint_width = padding.left; if (paint_width > rect->width) -@@ -2004,18 +2187,13 @@ static gint +@@ -2006,18 +2189,13 @@ static gint moz_gtk_progressbar_paint(cairo_t *cr, GdkRectangle* rect, GtkTextDirection direction) { @@ -841,7 +839,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g return MOZ_GTK_SUCCESS; } -@@ -2025,15 +2203,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr +@@ -2027,15 +2205,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr GtkTextDirection direction, GtkThemeWidgetType widget) { @@ -858,7 +856,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE || widget == MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE) { -@@ -2072,12 +2243,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr +@@ -2074,12 +2245,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr // gtk_render_activity was used to render progress chunks on GTK versions // before 3.13.7, see bug 1173907. if (!gtk_check_version(3, 13, 7)) { @@ -877,7 +875,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g return MOZ_GTK_SUCCESS; } -@@ -2094,7 +2267,7 @@ moz_gtk_get_tab_thickness(void) +@@ -2096,7 +2269,7 @@ moz_gtk_get_tab_thickness(void) style = gtk_widget_get_style_context(gTabWidget); gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK); @@ -886,7 +884,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g if (border.top < 2) return 2; /* some themes don't set ythickness correctly */ -@@ -2290,7 +2463,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan +@@ -2292,7 +2465,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan gtk_style_context_save(style); moz_gtk_tab_prepare_style_context(style, flags); @@ -895,7 +893,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g focusRect.x += padding.left; focusRect.width -= (padding.left + padding.right); -@@ -2406,7 +2579,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t * +@@ -2408,7 +2581,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t * } static gint @@ -904,7 +902,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g GtkTextDirection direction) { GtkStyleContext* style; -@@ -2467,7 +2640,7 @@ moz_gtk_menu_separator_paint(cairo_t *cr +@@ -2468,7 +2641,7 @@ moz_gtk_menu_separator_paint(cairo_t *cr border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget)); style = gtk_widget_get_style_context(gMenuSeparatorWidget); @@ -1137,7 +1135,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g moz_gtk_get_tab_scroll_arrow_size(gint* width, gint* height) { gint arrow_size; -@@ -3022,7 +3240,7 @@ moz_gtk_get_toolbar_separator_width(gint +@@ -3030,7 +3248,7 @@ moz_gtk_get_toolbar_separator_width(gint "separator-width", &separator_width, NULL); /* Just in case... */ @@ -1146,7 +1144,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g *size = MAX(*size, (wide_separators ? separator_width : border.left)); return MOZ_GTK_SUCCESS; } -@@ -3064,7 +3282,7 @@ moz_gtk_get_menu_separator_height(gint * +@@ -3072,7 +3290,7 @@ moz_gtk_get_menu_separator_height(gint * border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget)); style = gtk_widget_get_style_context(gMenuSeparatorWidget); @@ -1155,7 +1153,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g gtk_style_context_save(style); gtk_style_context_add_class(style, GTK_STYLE_CLASS_SEPARATOR); -@@ -3122,15 +3340,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro +@@ -3130,15 +3348,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro { ensure_scrollbar_widget(); @@ -1180,7 +1178,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g return MOZ_GTK_SUCCESS; } -@@ -3155,7 +3379,7 @@ moz_gtk_images_in_buttons() +@@ -3163,7 +3387,7 @@ moz_gtk_images_in_buttons() GtkSettings* settings; ensure_button_widget(); @@ -1189,7 +1187,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g g_object_get(settings, "gtk-button-images", &result, NULL); return result; -@@ -3183,7 +3407,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType +@@ -3191,7 +3415,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType } ensure_button_widget(); return moz_gtk_button_paint(cr, rect, state, @@ -1198,7 +1196,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g direction); break; case MOZ_GTK_CHECKBUTTON: -@@ -3233,7 +3457,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType +@@ -3241,7 +3465,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType case MOZ_GTK_SPINBUTTON_ENTRY: ensure_spin_widget(); return moz_gtk_entry_paint(cr, rect, state, @@ -1207,7 +1205,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g break; case MOZ_GTK_GRIPPER: return moz_gtk_gripper_paint(cr, rect, state, -@@ -3260,7 +3484,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType +@@ -3268,7 +3492,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType case MOZ_GTK_ENTRY: ensure_entry_widget(); return moz_gtk_entry_paint(cr, rect, state, @@ -1216,7 +1214,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g break; case MOZ_GTK_DROPDOWN: return moz_gtk_combo_box_paint(cr, rect, state, direction); -@@ -3272,7 +3496,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType +@@ -3280,7 +3504,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType case MOZ_GTK_DROPDOWN_ENTRY: ensure_combo_box_entry_widgets(); return moz_gtk_entry_paint(cr, rect, state, @@ -1225,7 +1223,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g break; case MOZ_GTK_CHECKBUTTON_CONTAINER: case MOZ_GTK_RADIOBUTTON_CONTAINER: -@@ -3324,7 +3548,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType +@@ -3332,7 +3556,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType (GtkArrowType) flags, direction); break; case MOZ_GTK_MENUBAR: @@ -1234,7 +1232,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g break; case MOZ_GTK_MENUPOPUP: return moz_gtk_menu_popup_paint(cr, rect, direction); -@@ -3375,7 +3599,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget( +@@ -3383,7 +3607,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget( { MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()"); ensure_scrollbar_widget(); @@ -1243,7 +1241,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g } gboolean moz_gtk_has_scrollbar_buttons(void) -@@ -3383,7 +3607,7 @@ gboolean moz_gtk_has_scrollbar_buttons(v +@@ -3391,7 +3615,7 @@ gboolean moz_gtk_has_scrollbar_buttons(v gboolean backward, forward, secondary_backward, secondary_forward; MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()"); ensure_scrollbar_widget(); @@ -1252,7 +1250,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g "has-backward-stepper", &backward, "has-forward-stepper", &forward, "has-secondary-backward-stepper", &secondary_backward, -@@ -3409,17 +3633,19 @@ moz_gtk_shutdown() +@@ -3415,17 +3639,19 @@ moz_gtk_shutdown() gProtoWindow = NULL; gProtoLayout = NULL; @@ -1279,7 +1277,7 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g gComboBoxWidget = NULL; gComboBoxButtonWidget = NULL; gComboBoxSeparatorWidget = NULL; -@@ -3427,12 +3653,12 @@ moz_gtk_shutdown() +@@ -3433,12 +3659,12 @@ moz_gtk_shutdown() gComboBoxEntryWidget = NULL; gComboBoxEntryButtonWidget = NULL; gComboBoxEntryArrowWidget = NULL; @@ -1294,9 +1292,9 @@ diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/g gTabWidget = NULL; gTooltipWidget = NULL; gMenuBarWidget = NULL; -diff -up firefox-45.0.2/widget/gtk/gtkdrawing.h.gtk3-20 firefox-45.0.2/widget/gtk/gtkdrawing.h ---- firefox-45.0.2/widget/gtk/gtkdrawing.h.gtk3-20 2016-04-08 01:55:04.000000000 +0200 -+++ firefox-45.0.2/widget/gtk/gtkdrawing.h 2016-04-20 15:00:29.468048948 +0200 +diff -up firefox-46.0/widget/gtk/gtkdrawing.h.gtk3-20 firefox-46.0/widget/gtk/gtkdrawing.h +--- firefox-46.0/widget/gtk/gtkdrawing.h.gtk3-20 2016-04-22 02:37:27.000000000 +0200 ++++ firefox-46.0/widget/gtk/gtkdrawing.h 2016-04-25 14:42:42.000000000 +0200 @@ -67,6 +67,13 @@ typedef enum { MOZ_GTK_TAB_SELECTED = 1 << 10 } GtkTabFlags; @@ -1311,18 +1309,17 @@ diff -up firefox-45.0.2/widget/gtk/gtkdrawing.h.gtk3-20 firefox-45.0.2/widget/gt /** flags for menuitems **/ typedef enum { /* menuitem is part of the menubar */ -@@ -394,6 +401,10 @@ gint moz_gtk_get_tab_scroll_arrow_size(g - */ - gint moz_gtk_get_arrow_size(gint* width, gint* height); +@@ -396,6 +403,9 @@ void + moz_gtk_get_arrow_size(GtkThemeWidgetType widgetType, + gint* width, gint* height); +gint moz_gtk_get_entry_height(gint* height); -+ +gint moz_gtk_get_button_height(gint* height); + /** * Get the desired size of a toolbar separator * size: [OUT] the desired width -@@ -464,6 +475,12 @@ gboolean moz_gtk_images_in_buttons(void) +@@ -466,6 +476,12 @@ gboolean moz_gtk_images_in_buttons(void) */ gboolean moz_gtk_has_scrollbar_buttons(void); @@ -1335,10 +1332,10 @@ diff -up firefox-45.0.2/widget/gtk/gtkdrawing.h.gtk3-20 firefox-45.0.2/widget/gt #ifdef __cplusplus } #endif /* __cplusplus */ -diff -up firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c ---- firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c.gtk3-20 2016-04-20 15:00:29.443048846 +0200 -+++ firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c 2016-04-20 15:00:29.469048952 +0200 -@@ -503,6 +503,11 @@ STUB(gtk_window_set_type_hint) +diff -up firefox-46.0/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-46.0/widget/gtk/mozgtk/mozgtk.c +--- firefox-46.0/widget/gtk/mozgtk/mozgtk.c.gtk3-20 2016-04-22 02:37:27.000000000 +0200 ++++ firefox-46.0/widget/gtk/mozgtk/mozgtk.c 2016-04-25 14:46:15.299592716 +0200 +@@ -504,6 +504,11 @@ STUB(gtk_window_set_type_hint) STUB(gtk_window_set_wmclass) STUB(gtk_window_unfullscreen) STUB(gtk_window_unmaximize) @@ -1350,15 +1347,7 @@ diff -up firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.2/widget #endif #ifdef GTK3_SYMBOLS -@@ -550,6 +555,7 @@ STUB(gtk_style_context_get_border_color) - STUB(gtk_style_context_get_color) - STUB(gtk_style_context_get_margin) - STUB(gtk_style_context_get_padding) -+STUB(gtk_style_context_get_state) - STUB(gtk_style_context_has_class) - STUB(gtk_style_context_new) - STUB(gtk_style_context_remove_class) -@@ -577,6 +583,13 @@ STUB(gtk_color_chooser_get_type) +@@ -581,6 +586,13 @@ STUB(gtk_color_chooser_get_type) STUB(gtk_color_chooser_set_rgba) STUB(gtk_color_chooser_get_rgba) STUB(gtk_color_chooser_set_use_alpha) @@ -1372,10 +1361,10 @@ diff -up firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.2/widget #endif #ifdef GTK2_SYMBOLS -diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp ---- firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 2016-04-08 01:55:04.000000000 +0200 -+++ firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp 2016-04-20 15:00:29.469048952 +0200 -@@ -232,14 +232,18 @@ nsLookAndFeel::NativeGetColor(ColorID aI +diff -up firefox-46.0/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-46.0/widget/gtk/nsLookAndFeel.cpp +--- firefox-46.0/widget/gtk/nsLookAndFeel.cpp.gtk3-20 2016-04-22 02:37:27.000000000 +0200 ++++ firefox-46.0/widget/gtk/nsLookAndFeel.cpp 2016-04-25 14:18:25.000000000 +0200 +@@ -353,14 +353,18 @@ nsLookAndFeel::NativeGetColor(ColorID aI case eColorID_activeborder: // active window border gtk_style_context_get_border_color(mBackgroundStyle, @@ -1396,7 +1385,7 @@ diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widg aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); break; case eColorID_graytext: // disabled text in windows, menus, etc. -@@ -248,9 +252,12 @@ nsLookAndFeel::NativeGetColor(ColorID aI +@@ -369,9 +373,12 @@ nsLookAndFeel::NativeGetColor(ColorID aI break; case eColorID_inactivecaption: // inactive window caption @@ -1410,7 +1399,7 @@ diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widg aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); break; #endif -@@ -376,13 +383,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI +@@ -497,13 +504,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI case eColorID__moz_buttondefault: // default button border color gtk_style_context_get_border_color(mButtonStyle, @@ -1430,7 +1419,7 @@ diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widg aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); break; case eColorID__moz_buttonhovertext: -@@ -989,7 +1000,7 @@ nsLookAndFeel::Init() +@@ -1110,7 +1121,7 @@ nsLookAndFeel::Init() style = create_context(path); gtk_style_context_add_class(style, GTK_STYLE_CLASS_SCROLLBAR); gtk_style_context_add_class(style, GTK_STYLE_CLASS_TROUGH); @@ -1439,7 +1428,7 @@ diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widg sMozScrollbar = GDK_RGBA_TO_NS_RGBA(color); g_object_unref(style); -@@ -997,18 +1008,18 @@ nsLookAndFeel::Init() +@@ -1118,18 +1129,18 @@ nsLookAndFeel::Init() style = create_context(path); gtk_style_context_save(style); gtk_style_context_add_class(style, GTK_STYLE_CLASS_BACKGROUND); @@ -1462,7 +1451,7 @@ diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widg sInfoText = GDK_RGBA_TO_NS_RGBA(color); g_object_unref(style); -@@ -1023,20 +1034,26 @@ nsLookAndFeel::Init() +@@ -1144,20 +1155,26 @@ nsLookAndFeel::Init() gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); style = gtk_widget_get_style_context(accel_label); @@ -1494,7 +1483,7 @@ diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widg g_object_unref(menu); #endif -@@ -1145,44 +1162,54 @@ nsLookAndFeel::Init() +@@ -1266,44 +1283,54 @@ nsLookAndFeel::Init() GDK_COLOR_TO_NS_RGB(style->dark[GTK_STATE_NORMAL]); } #else @@ -1566,7 +1555,7 @@ diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widg // GTK's guide to fancy odd row background colors: // 1) Check if a theme explicitly defines an odd row color -@@ -1195,7 +1222,7 @@ nsLookAndFeel::Init() +@@ -1316,7 +1343,7 @@ nsLookAndFeel::Init() // Get odd row background color gtk_style_context_save(style); gtk_style_context_add_region(style, GTK_STYLE_REGION_ROW, GTK_REGION_ODD); @@ -1575,16 +1564,7 @@ diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widg sOddCellBackground = GDK_RGBA_TO_NS_RGBA(color); gtk_style_context_restore(style); -@@ -1205,7 +1232,7 @@ nsLookAndFeel::Init() - // TODO GTK3 - update sFrameOuterLightBorder - // for GTK_BORDER_STYLE_INSET/OUTSET/GROVE/RIDGE border styles (Bug 978172). - style = gtk_widget_get_style_context(frame); -- gtk_style_context_get_border_color(style, GTK_STATE_FLAG_NORMAL, &color); -+ gtk_style_context_get_border_color(style, gtk_style_context_get_state(style), &color); - sFrameInnerDarkBorder = sFrameOuterLightBorder = GDK_RGBA_TO_NS_RGBA(color); - - gtk_widget_path_free(path); -@@ -1217,9 +1244,11 @@ nsLookAndFeel::Init() +@@ -1334,9 +1361,11 @@ nsLookAndFeel::Init() gtk_container_add(GTK_CONTAINER(parent), infoBar); gtk_container_add(GTK_CONTAINER(infoBarContent), infoBarLabel); style = gtk_widget_get_style_context(infoBarLabel); @@ -1597,10 +1577,10 @@ diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widg #endif // Some themes have a unified menu bar, and support window dragging on it gboolean supports_menubar_drag = FALSE; -diff -up firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp ---- firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 2016-04-08 01:55:04.000000000 +0200 -+++ firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp 2016-04-20 15:00:29.469048952 +0200 -@@ -1548,9 +1548,6 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n +diff -up firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp +--- firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 2016-04-25 14:46:15.300592722 +0200 ++++ firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp 2016-04-25 14:40:42.000000000 +0200 +@@ -1567,9 +1567,6 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n case NS_THEME_RADIO_CONTAINER: case NS_THEME_CHECKBOX_LABEL: case NS_THEME_RADIO_LABEL: @@ -1609,12 +1589,11 @@ diff -up firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-45.0.2/w - case NS_THEME_TOOLBAR_BUTTON: case NS_THEME_TREEVIEW_HEADER_CELL: { - // Just include our border, and let the box code augment the size. -@@ -1560,6 +1557,21 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n - aResult->width = border.left + border.right; - aResult->height = border.top + border.bottom; + if (aWidgetType == NS_THEME_DROPDOWN) { +@@ -1588,6 +1585,21 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n + aResult->height += border.top + border.bottom; } -+ break; + break; + case NS_THEME_BUTTON: + case NS_THEME_DROPDOWN: + case NS_THEME_TOOLBAR_BUTTON: @@ -1629,7 +1608,8 @@ diff -up firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-45.0.2/w + { + moz_gtk_get_entry_height(&aResult->height); + } - break; ++ break; case NS_THEME_TOOLBAR_SEPARATOR: { + gint separator_width;