diff -up firefox-48.0/widget/gtk/gtk3drawing.cpp.gtk3-20 firefox-48.0/widget/gtk/gtk3drawing.cpp

--- firefox-48.0/widget/gtk/gtk3drawing.cpp.gtk3-20	2016-07-25 22:22:07.000000000 +0200

+++ firefox-48.0/widget/gtk/gtk3drawing.cpp	2016-07-29 09:15:11.822285857 +0200

@@ -18,15 +18,9 @@

-static GtkWidget* gProtoWindow;

-static GtkWidget* gToggleButtonWidget;

-static GtkWidget* gButtonArrowWidget;

@@ -35,30 +29,15 @@ static GtkWidget* gComboBoxEntryWidget;

 static GtkWidget* gComboBoxEntryTextareaWidget;

-static GtkWidget* gHandleBoxWidget;

-static GtkWidget* gToolbarWidget;

-static GtkWidget* gFrameWidget;

-static GtkWidget* gTextViewWidget;

-static GtkWidget* gMenuBarWidget;

-static GtkWidget* gMenuBarItemWidget;

-static GtkWidget* gMenuPopupWidget;

-static GtkWidget* gMenuItemWidget;

 static GtkWidget* gImageMenuItemWidget;

 static GtkWidget* gCheckMenuItemWidget;

 static GtkWidget* gTreeViewWidget;

 static GtkTreeViewColumn* gMiddleTreeViewColumn;

 static GtkWidget* gTreeHeaderCellWidget;

 static GtkWidget* gTreeHeaderSortArrowWidget;

-static GtkWidget* gExpanderWidget;

-static GtkWidget* gToolbarSeparatorWidget;

-static GtkWidget* gMenuSeparatorWidget;

 static GtkWidget* gHPanedWidget;

 static GtkWidget* gVPanedWidget;

-static GtkWidget* gScrolledWindowWidget;

-static GtkWidget* gInfoBar;

 static style_prop_t style_prop_func;

 static gboolean have_arrow_scaling;

@@ -94,15 +73,6 @@ GetStateFlagsFromGtkWidgetState(GtkWidge

-/* 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. */

-static void

-moz_gtk_set_widget_name(GtkWidget* widget)

-{

-    gtk_widget_set_name(widget, "MozillaGtkWidget");

-}

-

 gint

 moz_gtk_enable_style_props(style_prop_t styleGetProp)

 {

@@ -111,15 +81,6 @@ moz_gtk_enable_style_props(style_prop_t

 }

-ensure_window_widget()

-{

-    if (!gProtoWindow) {

-        gProtoWindow = GetWidget(MOZ_GTK_WINDOW);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

 setup_widget_prototype(GtkWidget* widget)

     if (!gProtoLayout) {

@@ -130,16 +91,6 @@ setup_widget_prototype(GtkWidget* widget

 }

 static gint

-ensure_button_widget()

-{

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

 ensure_hpaned_widget()

     if (!gHPanedWidget) {

@@ -160,40 +111,6 @@ ensure_vpaned_widget()

-ensure_toggle_button_widget()

-{

-    if (!gToggleButtonWidget) {

-        gToggleButtonWidget = gtk_toggle_button_new();

-        setup_widget_prototype(gToggleButtonWidget);

-  }

-  return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_button_arrow_widget()

-{

-    if (!gButtonArrowWidget) {

-        ensure_toggle_button_widget();

-

-        gButtonArrowWidget = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);

-        gtk_container_add(GTK_CONTAINER(gToggleButtonWidget), gButtonArrowWidget);

-        gtk_widget_realize(gButtonArrowWidget);

-        gtk_widget_show(gButtonArrowWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_spin_widget()

-{

-}

-

-static gint

 ensure_scale_widget()

 {

   if (!gHScaleWidget) {

@@ -207,16 +124,6 @@ ensure_scale_widget()

   return MOZ_GTK_SUCCESS;

-static gint

-ensure_entry_widget()

-{

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

 /* We need to have pointers to the inner widgets (button, separator, arrow)

  * of the ComboBox to get the correct rendering from theme engines which

  * special cases their look. Since the inner layout can change, we ask GTK

@@ -225,7 +132,7 @@ ensure_entry_widget()

  * g_object_add_weak_pointer().

  * Note that if we don't find the inner widgets (which shouldn't happen), we

  * fallback to use generic "non-inner" widgets, and they don't need that kind

- * of weak pointer since they are explicit children of gProtoWindow and as

+ * of weak pointer since they are explicit children of gProtoLayout and as

  * such GTK holds a strong reference to them. */

 static void

 moz_gtk_get_combo_box_inner_button(GtkWidget *widget, gpointer client_data)

@@ -297,16 +204,14 @@ ensure_combo_box_widgets()

         /* Shouldn't be reached with current internal gtk implementation; we

          * use a generic toggle button as last resort fallback to avoid

          * crashing. */

-        ensure_toggle_button_widget();

-        gComboBoxButtonWidget = gToggleButtonWidget;

+        gComboBoxButtonWidget = GetWidget(MOZ_GTK_TOGGLE_BUTTON);

     if (!gComboBoxArrowWidget) {

         /* Shouldn't be reached with current internal gtk implementation;

          * we gButtonArrowWidget as last resort fallback to avoid

          * crashing. */

-        ensure_button_arrow_widget();

-        gComboBoxArrowWidget = gButtonArrowWidget;

+        gComboBoxArrowWidget = GetWidget(MOZ_GTK_BUTTON_ARROW);

     }

     /* We don't test the validity of gComboBoxSeparatorWidget since there

@@ -316,15 +221,6 @@ ensure_combo_box_widgets()

-static void

-ensure_info_bar()

-{

-  if (!gInfoBar) {

-      gInfoBar = gtk_info_bar_new();

-      setup_widget_prototype(gInfoBar);

-  }

-}

-

 /* We need to have pointers to the inner widgets (entry, button, arrow) of

  * the ComboBoxEntry to get the correct rendering from theme engines which

  * special cases their look. Since the inner layout can change, we ask GTK

@@ -333,7 +229,7 @@ ensure_info_bar()

  * g_object_add_weak_pointer().

  * Note that if we don't find the inner widgets (which shouldn't happen), we

  * fallback to use generic "non-inner" widgets, and they don't need that kind

- * of weak pointer since they are explicit children of gProtoWindow and as

+ * of weak pointer since they are explicit children of gProtoLayout and as

  * such GTK holds a strong reference to them. */

 static void

 moz_gtk_get_combo_box_entry_inner_widgets(GtkWidget *widget,

@@ -385,8 +281,7 @@ ensure_combo_box_entry_widgets()

     if (!gComboBoxEntryTextareaWidget) {

-        ensure_entry_widget();

+        gComboBoxEntryTextareaWidget = GetWidget(MOZ_GTK_ENTRY);

@@ -412,68 +307,19 @@ ensure_combo_box_entry_widgets()

         /* Shouldn't be reached with current internal gtk implementation;

          * we use a generic toggle button as last resort fallback to avoid

          * crashing. */

-        ensure_toggle_button_widget();

-        gComboBoxEntryButtonWidget = gToggleButtonWidget;

+        gComboBoxEntryButtonWidget = GetWidget(MOZ_GTK_TOGGLE_BUTTON);

     }

     if (!gComboBoxEntryArrowWidget) {

         /* Shouldn't be reached with current internal gtk implementation;

          * we gButtonArrowWidget as last resort fallback to avoid

          * crashing. */

-        ensure_button_arrow_widget();

-        gComboBoxEntryArrowWidget = gButtonArrowWidget;

+        gComboBoxEntryArrowWidget = GetWidget(MOZ_GTK_BUTTON_ARROW);

     }

     return MOZ_GTK_SUCCESS;

 }

-

-static gint

-ensure_handlebox_widget()

-{

-    if (!gHandleBoxWidget) {

-        gHandleBoxWidget = gtk_handle_box_new();

-        setup_widget_prototype(gHandleBoxWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_toolbar_widget()

-{

-    if (!gToolbarWidget) {

-        ensure_handlebox_widget();

-        gToolbarWidget = gtk_toolbar_new();

-        gtk_container_add(GTK_CONTAINER(gHandleBoxWidget), gToolbarWidget);

-        gtk_widget_realize(gToolbarWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_toolbar_separator_widget()

-{

-    if (!gToolbarSeparatorWidget) {

-        ensure_toolbar_widget();

-        gToolbarSeparatorWidget = GTK_WIDGET(gtk_separator_tool_item_new());

-        setup_widget_prototype(gToolbarSeparatorWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_tooltip_widget()

-{

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

 static gint

 ensure_tab_widget()

 {

@@ -485,81 +331,11 @@ ensure_tab_widget()

-ensure_progress_widget()

-{

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_frame_widget()

-{

-    if (!gFrameWidget) {

-        gFrameWidget = gtk_frame_new(NULL);

-        setup_widget_prototype(gFrameWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_menu_bar_widget()

-{

-    if (!gMenuBarWidget) {

-        gMenuBarWidget = gtk_menu_bar_new();

-        setup_widget_prototype(gMenuBarWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_menu_bar_item_widget()

-{

-    if (!gMenuBarItemWidget) {

-        ensure_menu_bar_widget();

-        gMenuBarItemWidget = gtk_menu_item_new();

-        gtk_menu_shell_append(GTK_MENU_SHELL(gMenuBarWidget),

-                              gMenuBarItemWidget);

-        gtk_widget_realize(gMenuBarItemWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_menu_popup_widget()

-{

-    if (!gMenuPopupWidget) {

-        ensure_window_widget();

-        gMenuPopupWidget = gtk_menu_new();

-        gtk_menu_attach_to_widget(GTK_MENU(gMenuPopupWidget), gProtoWindow,

-                                  NULL);

-        gtk_widget_realize(gMenuPopupWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_menu_item_widget()

-{

-    if (!gMenuItemWidget) {

-        ensure_menu_popup_widget();

-        gMenuItemWidget = gtk_menu_item_new_with_label("M");

-        gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget),

-                              gMenuItemWidget);

-        gtk_widget_realize(gMenuItemWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

 ensure_image_menu_item_widget()

 {

     if (!gImageMenuItemWidget) {

-        ensure_menu_popup_widget();

         gImageMenuItemWidget = gtk_image_menu_item_new();

-        gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget),

+        gtk_menu_shell_append(GTK_MENU_SHELL(GetWidget(MOZ_GTK_MENUPOPUP)),

                               gImageMenuItemWidget);

         gtk_widget_realize(gImageMenuItemWidget);

@@ -567,25 +343,11 @@ ensure_image_menu_item_widget()

 static gint

-ensure_menu_separator_widget()

-{

-    if (!gMenuSeparatorWidget) {

-        ensure_menu_popup_widget();

-        gMenuSeparatorWidget = gtk_separator_menu_item_new();

-        gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget),

-                              gMenuSeparatorWidget);

-        gtk_widget_realize(gMenuSeparatorWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-        ensure_menu_popup_widget();

-        gCheckMenuItemWidget = gtk_check_menu_item_new_with_label("M");

-        gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget),

+        gCheckMenuItemWidget = gtk_check_menu_item_new();

+        gtk_menu_shell_append(GTK_MENU_SHELL(GetWidget(MOZ_GTK_MENUPOPUP)),

                               gCheckMenuItemWidget);

         gtk_widget_realize(gCheckMenuItemWidget);

     }

@@ -646,37 +408,6 @@ ensure_tree_header_cell_widget()

     return MOZ_GTK_SUCCESS;

 }

-static gint

-ensure_expander_widget()

-{

-    if (!gExpanderWidget) {

-        gExpanderWidget = gtk_expander_new("M");

-        setup_widget_prototype(gExpanderWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static gint

-ensure_scrolled_window_widget()

-{

-    if (!gScrolledWindowWidget) {

-        gScrolledWindowWidget = gtk_scrolled_window_new(NULL, NULL);

-        setup_widget_prototype(gScrolledWindowWidget);

-    }

-    return MOZ_GTK_SUCCESS;

-}

-

-static void

-ensure_text_view_widget()

-{

-    if (gTextViewWidget)

-        return;

-

-    gTextViewWidget = gtk_text_view_new();

-    ensure_scrolled_window_widget();

-    gtk_container_add(GTK_CONTAINER(gScrolledWindowWidget), gTextViewWidget);

-}

-

 gint

 moz_gtk_init()

@@ -729,26 +460,21 @@ moz_gtk_get_focus_outline_size(gint* foc

-

-    ensure_entry_widget();

-

+    GtkStyleContext *style = ClaimStyleContext(MOZ_GTK_ENTRY);

     gtk_style_context_get_border(style, GTK_STATE_FLAG_NORMAL, &border);

     gtk_style_context_get_padding(style, GTK_STATE_FLAG_NORMAL, &padding);

+    ReleaseStyleContext(style);

 }

 gint

 moz_gtk_menuitem_get_horizontal_padding(gint* horizontal_padding)

 {

-    ensure_menu_item_widget();

-    gtk_style_context_get_style(gtk_widget_get_style_context(gMenuItemWidget),

-                                "horizontal-padding", horizontal_padding,

-                                NULL);

+    gtk_widget_style_get(GetWidget(MOZ_GTK_MENUITEM),

+                         "horizontal-padding", horizontal_padding,

+                         nullptr);

@@ -771,10 +497,11 @@ moz_gtk_button_get_default_overflow(gint

 {

     GtkBorder* default_outside_border;

-    ensure_button_widget();

-    gtk_style_context_get_style(gtk_widget_get_style_context(gButtonWidget),

+    GtkStyleContext *style = ClaimStyleContext(MOZ_GTK_BUTTON);

+    gtk_style_context_get_style(style,

                                 "default-outside-border", &default_outside_border,

                                 NULL);

+    ReleaseStyleContext(style);

     if (default_outside_border) {

         *border_top = default_outside_border->top;

@@ -794,10 +521,11 @@ moz_gtk_button_get_default_border(gint*

 {

     GtkBorder* default_border;

-    ensure_button_widget();

-    gtk_style_context_get_style(gtk_widget_get_style_context(gButtonWidget),

+    GtkStyleContext *style = ClaimStyleContext(MOZ_GTK_BUTTON);

+    gtk_style_context_get_style(style,

                                 "default-border", &default_border,