mozilla: comparison mozilla-gtk3

equal deleted inserted replaced

-:0f93e8da34b6
+:6838f0c032f8
-diff -up firefox-46.0/widget/gtk/gtk3drawing.c.gtk3-20 firefox-46.0/widget/gtk/gtk3drawing.c
+diff -up firefox-46.0.1/widget/gtk/gtk3drawing.c.gtk3-20 firefox-46.0.1/widget/gtk/gtk3drawing.c
---- firefox-46.0/widget/gtk/gtk3drawing.c.gtk3-20	2016-04-22 02:37:27.000000000 +0200
+--- firefox-46.0.1/widget/gtk/gtk3drawing.c.gtk3-20	2016-05-03 07:31:12.000000000 +0200
-+++ firefox-46.0/widget/gtk/gtk3drawing.c	2016-04-25 14:56:19.006992927 +0200
++++ firefox-46.0.1/widget/gtk/gtk3drawing.c	2016-05-20 15:05:08.750151522 +0200
-@@ -17,32 +17,79 @@
+@@ -17,34 +17,86 @@
 #include <math.h>
 +#define MOZ_WIDGET_STYLES 4
 +
 +        } entry;
 +
 +        struct {
 +            GtkStyleContext*  style;
 +        } button;
++
++        struct {
++            GtkStyleContext*  style;
++            GtkStyleContext*  styleBackground;
++        } tooltip;
 +
 +        struct {
 +            GtkStyleContext*  style;
 +            GtkStyleContext*  styleContents;
 +            GtkStyleContext*  styleTrough;
 static GtkWidget* gFrameWidget;
 static GtkWidget* gStatusbarWidget;
 -static GtkWidget* gProgressWidget;
 +static MozGtkWidget gProgressBar;
 static GtkWidget* gTabWidget;
-static GtkWidget* gTooltipWidget;
+-static GtkWidget* gTooltipWidget;
++static MozGtkWidget gTooltip;
 static GtkWidget* gMenuBarWidget;
-@@ -78,6 +125,37 @@ static gboolean is_initialized;
+static GtkWidget* gMenuBarItemWidget;
+static GtkWidget* gMenuPopupWidget;
+@@ -78,6 +130,37 @@ static gboolean is_initialized;
 #define GTK_STATE_FLAG_CHECKED (1 << 11)
 #endif
 +void moz_gtk_widget_free(MozGtkWidget *aMozWidget)
 +{
 +                          GtkBorder *padding);
 +
 static GtkStateFlags
 GetStateFlagsFromGtkWidgetState(GtkWidgetState* state)
 {
-@@ -97,6 +175,41 @@ GetStateFlagsFromGtkWidgetState(GtkWidge
+@@ -97,6 +180,41 @@ GetStateFlagsFromGtkWidgetState(GtkWidge
 return stateFlags;
 }
 +GtkStyleContext *
 +moz_gtk_style_create(GtkCssNode *node, GtkStyleContext *parent)
 +}
 +
 /* Because we have such an unconventional way of drawing widgets, signal to the GTK theme engine
 that they are drawing for Mozilla instead of a conventional GTK app so they can do any specific
 things they may want to do. */
-@@ -141,9 +254,16 @@ setup_widget_prototype(GtkWidget* widget
+@@ -141,9 +259,16 @@ setup_widget_prototype(GtkWidget* widget
 static gint
 ensure_button_widget()
 {
 -    if (!gButtonWidget) {
 -        gButtonWidget = gtk_button_new_with_label("M");
 +
 +        gButton.button.style = moz_gtk_style_create(&path[0], NULL);
 }
 return MOZ_GTK_SUCCESS;
 }
-@@ -195,9 +315,21 @@ ensure_button_arrow_widget()
+@@ -195,9 +320,21 @@ ensure_button_arrow_widget()
 static gint
 ensure_checkbox_widget()
 {
 -    if (!gCheckboxWidget) {
 -        gCheckboxWidget = gtk_check_button_new_with_label("M");
 +        gCheckbox.check.styleLabel = moz_gtk_style_create(&path[2],
 +                                       gCheckbox.check.style);
 }
 return MOZ_GTK_SUCCESS;
 }
-@@ -205,9 +337,21 @@ ensure_checkbox_widget()
+@@ -205,9 +342,21 @@ ensure_checkbox_widget()
 static gint
 ensure_radiobutton_widget()
 {
 -    if (!gRadiobuttonWidget) {
 -        gRadiobuttonWidget = gtk_radio_button_new_with_label(NULL, "M");
 +        gRadiobutton.check.styleLabel = moz_gtk_style_create(&path[2],
 +                                          gRadiobutton.check.style);
 }
 return MOZ_GTK_SUCCESS;
 }
-@@ -215,25 +359,62 @@ ensure_radiobutton_widget()
+@@ -215,25 +364,62 @@ ensure_radiobutton_widget()
 static gint
 ensure_scrollbar_widget()
 {
 -    if (!gVertScrollbarWidget) {
 -        gVertScrollbarWidget = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL);
 +    }
 +    return MOZ_GTK_SUCCESS;
 }
 static gint
-@@ -253,9 +434,19 @@ ensure_scale_widget()
+@@ -253,9 +439,19 @@ ensure_scale_widget()
 static gint
 ensure_entry_widget()
 {
 -    if (!gEntryWidget) {
 -        gEntryWidget = gtk_entry_new();
 +        gEntry.entry.styleSelection = moz_gtk_style_create(&path[1],
 +                                                           gEntry.entry.style);
 }
 return MOZ_GTK_SUCCESS;
 }
-@@ -387,9 +578,9 @@ moz_gtk_get_combo_box_entry_inner_widget
+@@ -387,9 +583,9 @@ moz_gtk_get_combo_box_entry_inner_widget
 g_object_add_weak_pointer(G_OBJECT(widget),
 (gpointer) &gComboBoxEntryButtonWidget);
 } else if (GTK_IS_ENTRY(widget)) {
 -        gComboBoxEntryTextareaWidget = widget;
 +        gComboBoxEntryTextarea.widget = widget;
 -                                  (gpointer) &gComboBoxEntryTextareaWidget);
 +                                  (gpointer) &gComboBoxEntryTextarea.widget);
 } else
 return;
 gtk_widget_realize(widget);
-@@ -411,7 +602,7 @@ ensure_combo_box_entry_widgets()
+@@ -411,7 +607,7 @@ ensure_combo_box_entry_widgets()
 {
 GtkWidget* buttonChild;
 -    if (gComboBoxEntryTextareaWidget &&
 +    if (gComboBoxEntryTextarea.widget &&
 gComboBoxEntryButtonWidget &&
 gComboBoxEntryArrowWidget)
 return MOZ_GTK_SUCCESS;
-@@ -427,9 +618,9 @@ ensure_combo_box_entry_widgets()
+@@ -427,9 +623,9 @@ ensure_combo_box_entry_widgets()
 moz_gtk_get_combo_box_entry_inner_widgets,
 NULL);
 -    if (!gComboBoxEntryTextareaWidget) {
 +    if (!gComboBoxEntryTextarea.widget) {
 -        gComboBoxEntryTextareaWidget = gEntryWidget;
 +        gComboBoxEntryTextarea.widget = gEntry.widget;
 }
 if (gComboBoxEntryButtonWidget) {
-@@ -530,9 +721,21 @@ ensure_tab_widget()
+@@ -507,12 +703,18 @@ ensure_toolbar_separator_widget()
+static gint
+ensure_tooltip_widget()
+{
+-    if (!gTooltipWidget) {
+-        gTooltipWidget = gtk_window_new(GTK_WINDOW_POPUP);
+-        GtkStyleContext* style = gtk_widget_get_style_context(gTooltipWidget);
+-        gtk_style_context_add_class(style, GTK_STYLE_CLASS_TOOLTIP);
+-        gtk_widget_realize(gTooltipWidget);
+-        moz_gtk_set_widget_name(gTooltipWidget);
++    if (!gTooltip.widget) {
++        GtkCssNode path[] = {
++            { GTK_TYPE_TOOLTIP, "tooltip", NULL, NULL},
++            { GTK_TYPE_TOOLTIP, "tooltip", "background", NULL},
++        };
++
++        gTooltip.widget = gtk_window_new(GTK_WINDOW_POPUP);
++        gtk_widget_realize(gTooltip.widget);
++        moz_gtk_set_widget_name(gTooltip.widget);
++
++        gTooltip.tooltip.style = moz_gtk_style_create(&path[0], NULL);
++        gTooltip.tooltip.styleBackground = moz_gtk_style_create(&path[1], NULL);
+}
+return MOZ_GTK_SUCCESS;
+}
+@@ -530,9 +732,21 @@ ensure_tab_widget()
 static gint
 ensure_progress_widget()
 {
 -    if (!gProgressWidget) {
 -        gProgressWidget = gtk_progress_bar_new();
 +        gProgressBar.progress.styleProgress = moz_gtk_style_create(&path[2],
 +                                                gProgressBar.progress.styleTrough);
 }
 return MOZ_GTK_SUCCESS;
 }
-@@ -638,6 +841,11 @@ static gint
+@@ -638,6 +852,11 @@ static gint
 ensure_check_menu_item_widget()
 {
 if (!gCheckMenuItemWidget) {
 +        GtkCssNode path[] = {
 +           { GTK_TYPE_CHECK_MENU_ITEM, "menuitem", NULL, NULL },
 +        };
 +
 ensure_menu_popup_widget();
 gCheckMenuItemWidget = gtk_check_menu_item_new_with_label("M");
 gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget),
-@@ -752,7 +960,7 @@ moz_gtk_checkbox_get_metrics(gint* indic
+@@ -752,7 +971,7 @@ moz_gtk_checkbox_get_metrics(gint* indic
 {
 ensure_checkbox_widget();
 -    gtk_widget_style_get (gCheckboxWidget,
 +    gtk_widget_style_get (gCheckbox.widget,
 "indicator_size", indicator_size,
 "indicator_spacing", indicator_spacing,
 NULL);
-@@ -765,7 +973,7 @@ moz_gtk_radio_get_metrics(gint* indicato
+@@ -765,7 +984,7 @@ moz_gtk_radio_get_metrics(gint* indicato
 {
 ensure_radiobutton_widget();
 -    gtk_widget_style_get (gRadiobuttonWidget,
 +    gtk_widget_style_get (gRadiobutton.widget,
 "indicator_size", indicator_size,
 "indicator_spacing", indicator_spacing,
 NULL);
-@@ -778,13 +986,12 @@ moz_gtk_get_focus_outline_size(gint* foc
+@@ -778,13 +997,13 @@ moz_gtk_get_focus_outline_size(gint* foc
 {
 GtkBorder border;
 GtkBorder padding;
 -    GtkStyleContext *style;
-+    GtkStyleContext* style = gEntry.entry.style;
++    GtkStyleContext* style;
 ensure_entry_widget();
 -    style = gtk_widget_get_style_context(gEntryWidget);
 -    gtk_style_context_get_border(style, 0, &border);
 -    gtk_style_context_get_padding(style, 0, &padding);
++    style = gEntry.entry.style;
 +    gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
 +    gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
 *focus_h_width = border.left + padding.left;
 *focus_v_width = border.top + padding.top;
 return MOZ_GTK_SUCCESS;
-@@ -821,7 +1028,7 @@ moz_gtk_button_get_default_overflow(gint
+@@ -821,7 +1040,7 @@ moz_gtk_button_get_default_overflow(gint
 GtkBorder* default_outside_border;
 ensure_button_widget();
 -    gtk_widget_style_get(gButtonWidget,
 +    gtk_widget_style_get(gButton.widget,
 "default-outside-border", &default_outside_border,
 NULL);
-@@ -844,7 +1051,7 @@ moz_gtk_button_get_default_border(gint*
+@@ -844,7 +1063,7 @@ moz_gtk_button_get_default_border(gint*
 GtkBorder* default_border;
 ensure_button_widget();
 -    gtk_widget_style_get(gButtonWidget,
 +    gtk_widget_style_get(gButton.widget,
 "default-border", &default_border,
 NULL);
-@@ -935,7 +1142,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec
+@@ -935,7 +1154,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec
 if (state->focused) {
 GtkBorder border;
 -        gtk_style_context_get_border(style, state_flags, &border);
 +        moz_gtk_get_style_border(style, state_flags, &border);
 x += border.left;
 y += border.top;
 width -= (border.left + border.right);
-@@ -956,15 +1163,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -956,15 +1175,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;
 -    GtkWidget *w;
 -    GtkStyleContext *style;
 -        w = gCheckboxWidget;
 +        w = &gCheckbox;
 }
 // XXX we should assert rect->height >= indicator_size too
-@@ -983,11 +1189,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -983,11 +1201,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
 focus_width = width + 2 * indicator_spacing;
 focus_height = height + 2 * indicator_spacing;
 -    style = gtk_widget_get_style_context(w);
 -
 +    gtk_widget_set_direction(w->widget, direction);
 +    gtk_style_context_save(w->check.styleCheck);
 if (selected)
 state_flags |= checkbox_check_state;
-@@ -995,13 +1199,15 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -995,13 +1211,15 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
 if (inconsistent)
 state_flags |= GTK_STATE_FLAG_INCONSISTENT;
 -    gtk_style_context_set_state(style, state_flags);
 +    gtk_style_context_set_state(w->check.styleCheck, state_flags);
 -            gtk_render_focus(style, cr, focus_x, focus_y,
 +            gtk_render_focus(w->check.styleCheck, cr, focus_x, focus_y,
 focus_width, focus_height);
 }
 }
-@@ -1010,15 +1216,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -1010,15 +1228,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.
 */
 -        gtk_style_context_add_class(style, GTK_STYLE_CLASS_CHECK);
 -        gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(gCheckboxWidget), inconsistent);
 -    gtk_style_context_restore(style);
 +    gtk_style_context_restore(w->check.styleCheck);
 return MOZ_GTK_SUCCESS;
 }
-@@ -1035,8 +1240,8 @@ calculate_button_inner_rect(GtkWidget* b
+@@ -1035,8 +1252,8 @@ calculate_button_inner_rect(GtkWidget* b
 style = gtk_widget_get_style_context(button);
 /* This mirrors gtkbutton's child positioning */
 -    gtk_style_context_get_border(style, 0, &border);
 -    gtk_style_context_get_padding(style, 0, &padding);
 +    gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
 +    gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
 inner_rect->x = rect->x + border.left + padding.left;
 inner_rect->y = rect->y + padding.top + border.top;
-@@ -1099,9 +1304,9 @@ moz_gtk_scrollbar_button_paint(cairo_t *
+@@ -1099,9 +1316,9 @@ moz_gtk_scrollbar_button_paint(cairo_t *
 ensure_scrollbar_widget();
 if (flags & MOZ_GTK_STEPPER_VERTICAL)
 -        scrollbar = gVertScrollbarWidget;
 +        scrollbar = gVertScrollbar.widget;
 -        scrollbar = gHorizScrollbarWidget;
 +        scrollbar = gHorizScrollbar.widget;
 gtk_widget_set_direction(scrollbar, direction);
-@@ -1181,25 +1386,22 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
+@@ -1181,25 +1398,22 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
 GtkTextDirection direction)
 {
 GtkStyleContext* style;
 -    GtkScrollbar *scrollbar;
 +        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);
-@@ -1208,7 +1410,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
+@@ -1208,7 +1422,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
 gtk_render_focus(style, cr,
 rect->x, rect->y, rect->width, rect->height);
 }
 -    gtk_style_context_restore(style);
 return MOZ_GTK_SUCCESS;
 }
-@@ -1220,24 +1421,20 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
+@@ -1220,24 +1433,20 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
 {
 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
 GtkStyleContext* style;
 -    GtkScrollbar *scrollbar;
 GtkBorder margin;
 gtk_style_context_set_state(style, state_flags);
 -
 gtk_style_context_get_margin (style, state_flags, &margin);
 gtk_render_slider(style, cr,
-@@ -1248,8 +1445,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
+@@ -1248,8 +1457,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
 (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ?
 GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
 -    gtk_style_context_restore(style);
 -
 return MOZ_GTK_SUCCESS;
 }
-@@ -1260,8 +1455,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta
+@@ -1260,8 +1467,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta
 GtkStyleContext* style;
 ensure_spin_widget();
 -    gtk_widget_set_direction(gSpinWidget, direction);
 -    style = gtk_widget_get_style_context(gSpinWidget);
 +    gtk_widget_set_direction(gSpin.widget, direction);
 +    style = gSpin.spin.style;
 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);
-@@ -1280,11 +1475,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G
+@@ -1280,11 +1487,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G
 GtkStyleContext* style;
 ensure_spin_widget();
 -    style = gtk_widget_get_style_context(gSpinWidget);
 +    style = gSpin.spin.style;
 -    gtk_widget_set_direction(gSpinWidget, direction);
 +    gtk_widget_set_direction(gSpin.widget, direction);
 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);
-@@ -1450,15 +1644,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec
+@@ -1450,15 +1656,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec
 static gint
 moz_gtk_entry_paint(cairo_t *cr, GdkRectangle* rect,
 GtkWidgetState* state,
 -                    GtkWidget* widget, GtkTextDirection direction)
 +                    MozGtkWidget* w, GtkTextDirection direction)
 -    style = gtk_widget_get_style_context(widget);
 +    gtk_widget_set_direction(w->widget, direction);
 if (draw_focus_outline_only) {
 // Inflate the given 'rect' with the focus outline size.
-@@ -1478,10 +1670,9 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect
+@@ -1478,10 +1682,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 */
 -    gtk_widget_set_sensitive(widget, !state->disabled);
 +    gtk_widget_set_sensitive(w->widget, !state->disabled);
 gtk_style_context_save(style);
 -    gtk_style_context_add_class(style, GTK_STYLE_CLASS_ENTRY);
 /* Now paint the shadow and focus border.
 * We do like in gtk_entry_draw_frame, we first draw the shadow, a tad
-@@ -1531,7 +1722,7 @@ moz_gtk_treeview_paint(cairo_t *cr, GdkR
+@@ -1531,7 +1734,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);
 -    gtk_style_context_get_border(style, state_flags, &border);
 +    moz_gtk_get_style_border(style, state_flags, &border);
 xthickness = border.left;
 ythickness = border.top;
-@@ -1702,7 +1893,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk
+@@ -1702,7 +1905,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk
 if (direction == GTK_TEXT_DIR_LTR) {
 GtkBorder padding;
 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
 -            gtk_style_context_get_padding(style, state_flags, &padding);
 +            moz_gtk_get_style_padding(style, state_flags, &padding);
 arrow_rect.x -= padding.left;
 }
 else
-@@ -1804,29 +1995,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk
+@@ -1804,29 +2007,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk
 gboolean isradio, GtkTextDirection direction)
 {
 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
 -    GtkStyleContext* style;
 -    GtkWidget *widget;
 -    gtk_style_context_restore(style);
 +    gtk_style_context_restore(widget->check.style);
 return MOZ_GTK_SUCCESS;
 }
-@@ -1836,32 +2025,26 @@ moz_gtk_toggle_label_paint(cairo_t *cr,
+@@ -1836,32 +2037,26 @@ moz_gtk_toggle_label_paint(cairo_t *cr,
 GtkWidgetState* state,
 gboolean isradio, GtkTextDirection direction)
 {
 -    GtkStyleContext *style;
 -    GtkWidget *widget;
 -        widget = gRadiobuttonWidget;
 +        widget = &gRadiobutton;
 } else {
 ensure_checkbox_widget();
 -        widget = gCheckboxWidget;
-+        widget = &gCheckbox;
+-    }
-}
 -    style = gtk_widget_get_style_context(widget);
 -    gtk_style_context_save(style);
 -    if (isradio) {
 -      gtk_style_context_add_class(style, GTK_STYLE_CLASS_RADIO);
 -    } else {
 -      gtk_style_context_add_class(style, GTK_STYLE_CLASS_CHECK);
--    }
++        widget = &gCheckbox;
+}
 -    gtk_widget_set_direction(widget, direction);
 +    gtk_style_context_save(widget->check.styleLabel);
 +    gtk_widget_set_direction(widget->widget, direction);
 -    gtk_style_context_set_state(style, GetStateFlagsFromGtkWidgetState(state));
 -    gtk_style_context_restore(style);
 +    gtk_style_context_restore(widget->check.styleLabel);
 return MOZ_GTK_SUCCESS;
 }
-@@ -1922,7 +2105,7 @@ moz_gtk_toolbar_separator_paint(cairo_t
+@@ -1922,7 +2117,7 @@ moz_gtk_toolbar_separator_paint(cairo_t
 rect->height * (end_fraction - start_fraction));
 } else {
 GtkBorder padding;
 -        gtk_style_context_get_padding(style, 0, &padding);
 +        gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
 paint_width = padding.left;
 if (paint_width > rect->width)
-@@ -2006,18 +2189,13 @@ static gint
+@@ -1945,9 +2140,9 @@ moz_gtk_tooltip_paint(cairo_t *cr, GdkRe
+GtkStyleContext* style;
+ensure_tooltip_widget();
+-    gtk_widget_set_direction(gTooltipWidget, direction);
++    gtk_widget_set_direction(gTooltip.widget, direction);
+-    style = gtk_widget_get_style_context(gTooltipWidget);
++    style = gTooltip.tooltip.styleBackground;
+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);
+return MOZ_GTK_SUCCESS;
+@@ -2006,18 +2201,13 @@ static gint
 moz_gtk_progressbar_paint(cairo_t *cr, GdkRectangle* rect,
 GtkTextDirection direction)
 {
 -    GtkStyleContext* style;
 -
 +    gtk_render_frame(gProgressBar.progress.styleTrough, cr,
 +                     rect->x, rect->y, rect->width, rect->height);
 return MOZ_GTK_SUCCESS;
 }
-@@ -2027,15 +2205,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
+@@ -2027,15 +2217,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
 GtkTextDirection direction,
 GtkThemeWidgetType widget)
 {
 -    GtkStyleContext* style;
 -
 -    gtk_style_context_add_class(style, GTK_STYLE_CLASS_PROGRESSBAR);
 +    gtk_widget_set_direction(gProgressBar.widget, direction);
 if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE ||
 widget == MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE) {
-@@ -2074,12 +2245,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
+@@ -2074,12 +2257,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)) {
 -      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);
 }
 -    gtk_style_context_restore(style);
 return MOZ_GTK_SUCCESS;
 }
-@@ -2096,7 +2269,7 @@ moz_gtk_get_tab_thickness(void)
+@@ -2096,7 +2281,7 @@ moz_gtk_get_tab_thickness(void)
 style = gtk_widget_get_style_context(gTabWidget);
 gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK);
 -    gtk_style_context_get_border(style, 0, &border);
 +    gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
 if (border.top < 2)
 return 2; /* some themes don't set ythickness correctly */
-@@ -2292,7 +2465,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan
+@@ -2292,7 +2477,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan
 gtk_style_context_save(style);
 moz_gtk_tab_prepare_style_context(style, flags);
 -      gtk_style_context_get_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding);
 +      moz_gtk_get_style_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding);
 focusRect.x += padding.left;
 focusRect.width -= (padding.left + padding.right);
-@@ -2408,7 +2581,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t *
+@@ -2408,7 +2593,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t *
 }
 static gint
 -moz_gtk_menu_bar_paint(cairo_t *cr, GdkRectangle* rect,
 +moz_gtk_menu_bar_paint(cairo_t *cr, GdkRectangle* rect, GtkWidgetState* state,
 GtkTextDirection direction)
 {
 GtkStyleContext* style;
-@@ -2468,7 +2641,7 @@ moz_gtk_menu_separator_paint(cairo_t *cr
+@@ -2468,7 +2653,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);
 -    gtk_style_context_get_padding(style, 0, &padding);
 +    gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
 x = rect->x + border_width;
 y = rect->y + border_width;
-@@ -2521,7 +2694,8 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk
+@@ -2521,7 +2706,8 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk
 item_widget = gMenuItemWidget;
 }
 style = gtk_widget_get_style_context(item_widget);
 -        gtk_style_context_save(style);
 +// TODO - FIX!
 +//        gtk_style_context_save(style);
 if (flags & MOZ_TOPLEVEL_MENU_ITEM) {
 gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR);
-@@ -2540,7 +2714,7 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk
+@@ -2540,7 +2726,7 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk
 gtk_render_background(style, cr, x, y, w, h);
 gtk_render_frame(style, cr, x, y, w, h);
 -        gtk_style_context_restore(style);
 +//        gtk_style_context_restore(style);
 }
 return MOZ_GTK_SUCCESS;
-@@ -2556,7 +2730,10 @@ moz_gtk_menu_arrow_paint(cairo_t *cr, Gd
+@@ -2556,7 +2742,10 @@ moz_gtk_menu_arrow_paint(cairo_t *cr, Gd
 ensure_menu_item_widget();
 gtk_widget_set_direction(gMenuItemWidget, direction);
 -
 +/*
 +                                                     GTK_STATE_FLAG_DIR_RTL;
 +*/
 style = gtk_widget_get_style_context(gMenuItemWidget);
 gtk_style_context_save(style);
 gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUITEM);
-@@ -2606,7 +2783,7 @@ moz_gtk_check_menu_item_paint(cairo_t *c
+@@ -2606,7 +2795,7 @@ moz_gtk_check_menu_item_paint(cairo_t *c
 }
 gtk_style_context_set_state(style, state_flags);
 -    gtk_style_context_get_padding(style, state_flags, &padding);
 +    moz_gtk_get_style_padding(style, state_flags, &padding);
 offset = gtk_container_get_border_width(GTK_CONTAINER(gCheckMenuItemWidget)) +
 padding.left + 2;
-@@ -2658,7 +2835,7 @@ moz_gtk_add_style_border(GtkStyleContext
+@@ -2658,7 +2847,7 @@ moz_gtk_add_style_border(GtkStyleContext
 {
 GtkBorder border;
 -    gtk_style_context_get_border(style, 0, &border);
 +    gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
 *left += border.left;
 *right += border.right;
-@@ -2667,12 +2844,22 @@ moz_gtk_add_style_border(GtkStyleContext
+@@ -2667,12 +2856,22 @@ moz_gtk_add_style_border(GtkStyleContext
 }
 static void
 +moz_gtk_get_style_border(GtkStyleContext* style, GtkStateFlags state_flags,
 +                         GtkBorder *border)
 -    gtk_style_context_get_padding(style, 0, &padding);
 +    gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
 *left += padding.left;
 *right += padding.right;
-@@ -2680,6 +2867,16 @@ moz_gtk_add_style_padding(GtkStyleContex
+@@ -2680,6 +2879,16 @@ moz_gtk_add_style_padding(GtkStyleContex
 *bottom += padding.bottom;
 }
 +static void
 +moz_gtk_get_style_padding(GtkStyleContext* style, GtkStateFlags state_flags,
 +}
 +
 gint
 moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
 gint* right, gint* bottom, GtkTextDirection direction,
-@@ -2694,36 +2891,27 @@ moz_gtk_get_widget_border(GtkThemeWidget
+@@ -2694,37 +2903,35 @@ moz_gtk_get_widget_border(GtkThemeWidget
 case MOZ_GTK_TOOLBAR_BUTTON:
 {
 ensure_button_widget();
 -            style = gtk_widget_get_style_context(gButtonWidget);
 -
 // XXX: Subtract 1 pixel from the padding to account for the default
 // padding in forms.css. See bug 1187385.
 *left = *top = *right = *bottom = -1;
 -            moz_gtk_add_style_padding(style, left, top, right, bottom);
 -            moz_gtk_add_style_border(style, left, top, right, bottom);
-+
 +            moz_gtk_add_style_padding(gEntry.entry.style, left, top, right, bottom);
 +            moz_gtk_add_style_border(gEntry.entry.style, left, top, right, bottom);
++
++            return MOZ_GTK_SUCCESS;
++        }
++    case MOZ_GTK_TOOLTIP:
++        {
++            ensure_tooltip_widget();
++            moz_gtk_add_style_padding(gTooltip.tooltip.styleBackground, left, top, right, bottom);
++            moz_gtk_add_style_border(gTooltip.tooltip.styleBackground, left, top, right, bottom);
 return MOZ_GTK_SUCCESS;
 }
-@@ -2759,7 +2947,7 @@ moz_gtk_get_widget_border(GtkThemeWidget
+case MOZ_GTK_TREEVIEW:
+@@ -2759,7 +2966,7 @@ moz_gtk_get_widget_border(GtkThemeWidget
 break;
 case MOZ_GTK_DROPDOWN_ENTRY:
 ensure_combo_box_entry_widgets();
 -        w = gComboBoxEntryTextareaWidget;
 +        w = gComboBoxEntryTextarea.widget;
 break;
 case MOZ_GTK_DROPDOWN_ARROW:
 ensure_combo_box_entry_widgets();
-@@ -2795,7 +2983,7 @@ moz_gtk_get_widget_border(GtkThemeWidget
+@@ -2795,7 +3002,7 @@ moz_gtk_get_widget_border(GtkThemeWidget
 if (!wide_separators) {
 style = gtk_widget_get_style_context(gComboBoxSeparatorWidget);
 -                    gtk_style_context_get_border(style, 0, &border);
 +                    gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
 separator_width = border.left;
 }
 }
-@@ -2814,14 +3002,17 @@ moz_gtk_get_widget_border(GtkThemeWidget
+@@ -2814,14 +3021,17 @@ moz_gtk_get_widget_border(GtkThemeWidget
 w = gTabWidget;
 break;
 case MOZ_GTK_PROGRESSBAR:
 -        ensure_progress_widget();
 -        w = gProgressWidget;
 -        w = gSpinWidget;
 +        w = gSpin.widget;
 break;
 case MOZ_GTK_SCALE_HORIZONTAL:
 ensure_scale_widget();
-@@ -2840,12 +3031,13 @@ moz_gtk_get_widget_border(GtkThemeWidget
+@@ -2840,12 +3050,13 @@ moz_gtk_get_widget_border(GtkThemeWidget
 {
 if (widget == MOZ_GTK_CHECKBUTTON_CONTAINER) {
 ensure_checkbox_widget();
 -                w = gCheckboxWidget;
 +                w = gCheckbox.widget;
 }
 -            style = gtk_widget_get_style_context(w);
 *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(w));
 moz_gtk_add_style_border(style,
-@@ -2978,6 +3170,32 @@ moz_gtk_get_combo_box_entry_button_size(
+@@ -2904,7 +3115,6 @@ moz_gtk_get_widget_border(GtkThemeWidget
+case MOZ_GTK_MENUSEPARATOR:
+/* These widgets have no borders.*/
+case MOZ_GTK_SPINBUTTON:
+-    case MOZ_GTK_TOOLTIP:
+case MOZ_GTK_WINDOW:
+case MOZ_GTK_RESIZER:
+case MOZ_GTK_MENUARROW:
+@@ -2978,6 +3188,32 @@ moz_gtk_get_combo_box_entry_button_size(
 }
 gint
 +moz_gtk_get_entry_height(gint* height)
 +{
 +
 +gint
 moz_gtk_get_tab_scroll_arrow_size(gint* width, gint* height)
 {
 gint arrow_size;
-@@ -3030,7 +3248,7 @@ moz_gtk_get_toolbar_separator_width(gint
+@@ -3030,7 +3266,7 @@ moz_gtk_get_toolbar_separator_width(gint
 "separator-width", &separator_width,
 NULL);
 /* Just in case... */
 -    gtk_style_context_get_border(style, 0, &border);
 +    gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
 *size = MAX(*size, (wide_separators ? separator_width : border.left));
 return MOZ_GTK_SUCCESS;
 }
-@@ -3072,7 +3290,7 @@ moz_gtk_get_menu_separator_height(gint *
+@@ -3072,7 +3308,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);
 -    gtk_style_context_get_padding(style, 0, &padding);
 +    gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
 gtk_style_context_save(style);
 gtk_style_context_add_class(style, GTK_STYLE_CLASS_SEPARATOR);
-@@ -3130,15 +3348,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro
+@@ -3130,15 +3366,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro
 {
 ensure_scrollbar_widget();
 -    gtk_widget_style_get (gHorizScrollbarWidget,
 +    gtk_widget_style_get (gHorizScrollbar.widget,
 +            gtk_range_get_min_slider_size(GTK_RANGE(gVertScrollbar.widget));
 +    }
 return MOZ_GTK_SUCCESS;
 }
-@@ -3163,7 +3387,7 @@ moz_gtk_images_in_buttons()
+@@ -3163,7 +3405,7 @@ moz_gtk_images_in_buttons()
 GtkSettings* settings;
 ensure_button_widget();
 -    settings = gtk_widget_get_settings(gButtonWidget);
 +    settings = gtk_widget_get_settings(gButton.widget);
 g_object_get(settings, "gtk-button-images", &result, NULL);
 return result;
-@@ -3191,7 +3415,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3191,7 +3433,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
 }
 ensure_button_widget();
 return moz_gtk_button_paint(cr, rect, state,
 -                                    (GtkReliefStyle) flags, gButtonWidget,
 +                                    (GtkReliefStyle) flags, gButton.widget,
 direction);
 break;
 case MOZ_GTK_CHECKBUTTON:
-@@ -3241,7 +3465,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3241,7 +3483,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
 case MOZ_GTK_SPINBUTTON_ENTRY:
 ensure_spin_widget();
 return moz_gtk_entry_paint(cr, rect, state,
 -                                   gSpinWidget, direction);
 +                                   &gSpin, direction);
 break;
 case MOZ_GTK_GRIPPER:
 return moz_gtk_gripper_paint(cr, rect, state,
-@@ -3268,7 +3492,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3268,7 +3510,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
 case MOZ_GTK_ENTRY:
 ensure_entry_widget();
 return moz_gtk_entry_paint(cr, rect, state,
 -                                   gEntryWidget, direction);
 +                                   &gEntry, direction);
 break;
 case MOZ_GTK_DROPDOWN:
 return moz_gtk_combo_box_paint(cr, rect, state, direction);
-@@ -3280,7 +3504,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3280,7 +3522,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
 case MOZ_GTK_DROPDOWN_ENTRY:
 ensure_combo_box_entry_widgets();
 return moz_gtk_entry_paint(cr, rect, state,
 -                                   gComboBoxEntryTextareaWidget, direction);
 +                                   &gComboBoxEntryTextarea, direction);
 break;
 case MOZ_GTK_CHECKBUTTON_CONTAINER:
 case MOZ_GTK_RADIOBUTTON_CONTAINER:
-@@ -3332,7 +3556,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3332,7 +3574,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
 (GtkArrowType) flags, direction);
 break;
 case MOZ_GTK_MENUBAR:
 -        return moz_gtk_menu_bar_paint(cr, rect, direction);
 +        return moz_gtk_menu_bar_paint(cr, rect, state, direction);
 break;
 case MOZ_GTK_MENUPOPUP:
 return moz_gtk_menu_popup_paint(cr, rect, direction);
-@@ -3383,7 +3607,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget(
+@@ -3383,7 +3625,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget(
 {
 MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()");
 ensure_scrollbar_widget();
 -    return gHorizScrollbarWidget;
 +    return gVertScrollbar.widget;
 }
 gboolean moz_gtk_has_scrollbar_buttons(void)
-@@ -3391,7 +3615,7 @@ gboolean moz_gtk_has_scrollbar_buttons(v
+@@ -3391,7 +3633,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();
 -    gtk_widget_style_get (gHorizScrollbarWidget,
 +    gtk_widget_style_get (gHorizScrollbar.widget,
 "has-backward-stepper", &backward,
 "has-forward-stepper", &forward,
 "has-secondary-backward-stepper", &secondary_backward,
-@@ -3415,17 +3639,19 @@ moz_gtk_shutdown()
+@@ -3403,8 +3645,8 @@ gboolean moz_gtk_has_scrollbar_buttons(v
+gint
+moz_gtk_shutdown()
+{
+-    if (gTooltipWidget)
+-        gtk_widget_destroy(gTooltipWidget);
++    moz_gtk_widget_free(&gTooltip);
++
+/* This will destroy all of our widgets */
+if (gProtoWindow)
+gtk_widget_destroy(gProtoWindow);
+@@ -3415,17 +3657,19 @@ moz_gtk_shutdown()
 gProtoWindow = NULL;
 gProtoLayout = NULL;
 -    gButtonWidget = NULL;
 +
 -    gEntryWidget = NULL;
 +    moz_gtk_widget_free(&gEntry);
 gComboBoxWidget = NULL;
 gComboBoxButtonWidget = NULL;
 gComboBoxSeparatorWidget = NULL;
-@@ -3433,12 +3659,12 @@ moz_gtk_shutdown()
+@@ -3433,14 +3677,13 @@ moz_gtk_shutdown()
 gComboBoxEntryWidget = NULL;
 gComboBoxEntryButtonWidget = NULL;
 gComboBoxEntryArrowWidget = NULL;
 -    gComboBoxEntryTextareaWidget = NULL;
 +    moz_gtk_widget_free(&gComboBoxEntryTextarea);
 gStatusbarWidget = NULL;
 gFrameWidget = NULL;
 -    gProgressWidget = NULL;
 +    moz_gtk_widget_free(&gProgressBar);
 gTabWidget = NULL;
-gTooltipWidget = NULL;
+-    gTooltipWidget = NULL;
 gMenuBarWidget = NULL;
-diff -up firefox-46.0/widget/gtk/gtkdrawing.h.gtk3-20 firefox-46.0/widget/gtk/gtkdrawing.h
+gMenuBarItemWidget = NULL;
---- firefox-46.0/widget/gtk/gtkdrawing.h.gtk3-20	2016-04-22 02:37:27.000000000 +0200
+gMenuPopupWidget = NULL;
-+++ firefox-46.0/widget/gtk/gtkdrawing.h	2016-04-25 14:42:42.000000000 +0200
+diff -up firefox-46.0.1/widget/gtk/gtkdrawing.h.gtk3-20 firefox-46.0.1/widget/gtk/gtkdrawing.h
+--- firefox-46.0.1/widget/gtk/gtkdrawing.h.gtk3-20	2016-05-03 07:31:12.000000000 +0200
++++ firefox-46.0.1/widget/gtk/gtkdrawing.h	2016-05-19 15:20:11.656519199 +0200
 @@ -67,6 +67,13 @@ typedef enum {
 MOZ_GTK_TAB_SELECTED        = 1 << 10
 } GtkTabFlags;
 +typedef struct {
 +
 +
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-diff -up firefox-46.0/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-46.0/widget/gtk/mozgtk/mozgtk.c
+diff -up firefox-46.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-46.0.1/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.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20	2016-05-03 07:31:12.000000000 +0200
-+++ firefox-46.0/widget/gtk/mozgtk/mozgtk.c	2016-04-25 14:46:15.299592716 +0200
++++ firefox-46.0.1/widget/gtk/mozgtk/mozgtk.c	2016-05-20 10:40:19.442320669 +0200
 @@ -504,6 +504,11 @@ STUB(gtk_window_set_type_hint)
 STUB(gtk_window_set_wmclass)
 STUB(gtk_window_unfullscreen)
 STUB(gtk_window_unmaximize)
 +STUB(gtk_widget_get_preferred_height_and_baseline_for_width)
 +STUB(gtk_spin_button_get_type)
 +STUB(gtk_button_get_type)
 #endif
 #ifdef GTK3_SYMBOLS
-@@ -581,6 +586,13 @@ STUB(gtk_color_chooser_get_type)
+@@ -581,6 +586,14 @@ 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)
 +STUB(gtk_style_context_get_path)
 +STUB(gtk_widget_path_copy)
 +STUB(gtk_widget_path_iter_set_object_name)
 +STUB(gtk_widget_path_iter_add_class)
 +STUB(gtk_widget_path_iter_get_state)
 +STUB(gtk_style_context_set_parent)
 +STUB(gtk_widget_path_unref)
++STUB(gtk_tooltip_get_type)
 #endif
 #ifdef GTK2_SYMBOLS
-diff -up firefox-46.0/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-46.0/widget/gtk/nsLookAndFeel.cpp
+diff -up firefox-46.0.1/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-46.0.1/widget/gtk/nsLookAndFeel.cpp
---- firefox-46.0/widget/gtk/nsLookAndFeel.cpp.gtk3-20	2016-04-22 02:37:27.000000000 +0200
+--- firefox-46.0.1/widget/gtk/nsLookAndFeel.cpp.gtk3-20	2016-05-03 07:31:12.000000000 +0200
-+++ firefox-46.0/widget/gtk/nsLookAndFeel.cpp	2016-04-25 14:18:25.000000000 +0200
++++ firefox-46.0.1/widget/gtk/nsLookAndFeel.cpp	2016-05-20 13:53:54.085049707 +0200
 @@ -353,14 +353,18 @@ nsLookAndFeel::NativeGetColor(ColorID aI
 case eColorID_activeborder:
 // active window border
 gtk_style_context_get_border_color(mBackgroundStyle,
 -                                           GTK_STATE_FLAG_NORMAL, &gdk_color);
 &gdk_color);
 +        gtk_style_context_restore(mButtonStyle);
 aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
 break;
 case eColorID__moz_buttonhovertext:
-@@ -1110,7 +1121,7 @@ nsLookAndFeel::Init()
+@@ -1110,27 +1126,29 @@ 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);
 -    gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
 +    gtk_style_context_get_background_color(style, gtk_style_context_get_state(style), &color);
 sMozScrollbar = GDK_RGBA_TO_NS_RGBA(color);
 g_object_unref(style);
-@@ -1118,18 +1129,18 @@ nsLookAndFeel::Init()
+// Window colors
 style = create_context(path);
-gtk_style_context_save(style);
+-    gtk_style_context_save(style);
 gtk_style_context_add_class(style, GTK_STYLE_CLASS_BACKGROUND);
 -    gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
 +    gtk_style_context_get_background_color(style, gtk_style_context_get_state(style), &color);
 sMozWindowBackground = GDK_RGBA_TO_NS_RGBA(color);
 -    gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
 +    gtk_style_context_get_color(style, gtk_style_context_get_state(style), &color);
 sMozWindowText = GDK_RGBA_TO_NS_RGBA(color);
-gtk_style_context_restore(style);
+-    gtk_style_context_restore(style);
++    g_object_unref(style);
 // tooltip foreground and background
-gtk_style_context_add_class(style, GTK_STYLE_CLASS_TOOLTIP);
+-    gtk_style_context_add_class(style, GTK_STYLE_CLASS_TOOLTIP);
++    GtkCssNode tooltipPath[] = {
++         { GTK_TYPE_TOOLTIP, "tooltip", NULL, NULL},
++    };
++    style = moz_gtk_style_create(tooltipPath, NULL);
++    gtk_style_context_get_color(style, gtk_style_context_get_state(style), &color);
++    sInfoText = GDK_RGBA_TO_NS_RGBA(color);
 gtk_style_context_add_class(style, GTK_STYLE_CLASS_BACKGROUND);
 -    gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
 +    gtk_style_context_get_background_color(style, gtk_style_context_get_state(style), &color);
 sInfoBackground = GDK_RGBA_TO_NS_RGBA(color);
 -    gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
-+    gtk_style_context_get_color(style, gtk_style_context_get_state(style), &color);
+-    sInfoText = GDK_RGBA_TO_NS_RGBA(color);
-sInfoText = GDK_RGBA_TO_NS_RGBA(color);
 g_object_unref(style);
-@@ -1144,20 +1155,26 @@ nsLookAndFeel::Init()
+// menu foreground & menu background
+@@ -1144,20 +1162,26 @@ nsLookAndFeel::Init()
 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 style = gtk_widget_get_style_context(accel_label);
 -    gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
 +    gtk_style_context_get_color(style, gtk_style_context_get_state(style), &color);
 sMenuHoverText = GDK_RGBA_TO_NS_RGBA(color);
 +    gtk_style_context_restore(style);
 g_object_unref(menu);
 #endif
-@@ -1266,44 +1283,54 @@ nsLookAndFeel::Init()
+@@ -1266,44 +1290,54 @@ nsLookAndFeel::Init()
 GDK_COLOR_TO_NS_RGB(style->dark[GTK_STATE_NORMAL]);
 }
 #else
 +    GtkCssNode labelPath[] = {
 +       { GTK_TYPE_LABEL, "label", "view", NULL },
 sMenuBarHoverText = GDK_RGBA_TO_NS_RGBA(color);
 +    gtk_style_context_restore(style);
 // GTK's guide to fancy odd row background colors:
 // 1) Check if a theme explicitly defines an odd row color
-@@ -1316,7 +1343,7 @@ nsLookAndFeel::Init()
+@@ -1316,7 +1350,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);
 -    gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
 +    gtk_style_context_get_background_color(style, gtk_style_context_get_state(style), &color);
 sOddCellBackground = GDK_RGBA_TO_NS_RGBA(color);
 gtk_style_context_restore(style);
-@@ -1334,9 +1361,11 @@ nsLookAndFeel::Init()
+@@ -1334,9 +1368,11 @@ nsLookAndFeel::Init()
 gtk_container_add(GTK_CONTAINER(parent), infoBar);
 gtk_container_add(GTK_CONTAINER(infoBarContent), infoBarLabel);
 style = gtk_widget_get_style_context(infoBarLabel);
 +    gtk_style_context_save(style);
 gtk_style_context_add_class(style, GTK_STYLE_CLASS_INFO);
 sInfoBarText = GDK_RGBA_TO_NS_RGBA(color);
 +    gtk_style_context_restore(style);
 #endif
 // Some themes have a unified menu bar, and support window dragging on it
 gboolean supports_menubar_drag = FALSE;
-diff -up firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp
+diff -up firefox-46.0.1/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-46.0.1/widget/gtk/nsNativeThemeGTK.cpp
---- firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20	2016-04-25 14:46:15.300592722 +0200
+--- firefox-46.0.1/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20	2016-05-03 07:31:12.000000000 +0200
-+++ firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp	2016-04-25 14:40:42.000000000 +0200
++++ firefox-46.0.1/widget/gtk/nsNativeThemeGTK.cpp	2016-05-19 15:20:11.658519202 +0200
 @@ -1567,9 +1567,6 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n
 case NS_THEME_RADIO_CONTAINER:
 case NS_THEME_CHECKBOX_LABEL:
 case NS_THEME_RADIO_LABEL:
 -  case NS_THEME_BUTTON:
 +    }
 +    break;
 case NS_THEME_TOOLBAR_SEPARATOR:
 {
 gint separator_width;

branch	firefox47
changeset 919	6838f0c032f8
parent 909	c6717354928b
child 926	6ab8b16f232c