Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 14:25:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1274745 use ClaimStyleContext to ensure GtkWindow exists before using for scrollbar background r=stransky+263117

Browse Source 
MozReview-Commit-ID: KKekEXJScM0

--HG--
extra : rebase_source : dd6b5261df5a1fe4e37b12c604f96af4d5c18e66
This commit is contained in:
Karl Tomlinson 2016-05-27 10:32:02 +12:00
parent 73e83d6b8d
commit 5aebf9bad8
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
widget/gtk/gtk3drawing.cpp
View File

@ -18,7 +18,6 @@
#include <math.h>
static GtkWidget* gProtoWindow;
static GtkWidget* gProtoLayout;
static GtkWidget* gButtonWidget;
static GtkWidget* gToggleButtonWidget;
@ -105,15 +104,6 @@ moz_gtk_enable_style_props(style_prop_t styleGetProp)
return MOZ_GTK_SUCCESS;
}
static gint
ensure_window_widget()
{
if (!gProtoWindow) {
gProtoWindow = GetWidget(MOZ_GTK_WINDOW);
}
return MOZ_GTK_SUCCESS;
}
static gint
setup_widget_prototype(GtkWidget* widget)
{
@ -220,7 +210,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)
@ -328,7 +318,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,
@ -762,17 +752,15 @@ static gint
moz_gtk_window_paint(cairo_t *cr, GdkRectangle* rect,
GtkTextDirection direction)
{
GtkStyleContext* style;
GtkStyleContext* style = ClaimStyleContext(MOZ_GTK_WINDOW, direction);
ensure_window_widget();
gtk_widget_set_direction(gProtoWindow, direction);
style = gtk_widget_get_style_context(gProtoWindow);
gtk_style_context_save(style);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_BACKGROUND);
gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
gtk_style_context_restore(style);
ReleaseStyleContext(style);
return MOZ_GTK_SUCCESS;
}
@ -1057,9 +1045,10 @@ moz_gtk_scrollbar_trough_paint(WidgetNodeType widget,
GtkTextDirection direction)
{
if (flags & MOZ_GTK_TRACK_OPAQUE) {
GtkStyleContext* style =
gtk_widget_get_style_context(GTK_WIDGET(gProtoWindow));
gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
GtkStyleContext* style = ClaimStyleContext(MOZ_GTK_WINDOW, direction);
gtk_render_background(style, cr,
rect->x, rect->y, rect->width, rect->height);
ReleaseStyleContext(style);
}
GtkStyleContext* style =
@ -3308,7 +3297,6 @@ moz_gtk_shutdown()
if (gTreeHeaderSortArrowWidget)
gtk_widget_destroy(gTreeHeaderSortArrowWidget);
gProtoWindow = NULL;
gProtoLayout = NULL;
gButtonWidget = NULL;
gToggleButtonWidget = NULL;