Date: Sat, 22 Nov 2014 10:43:16 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1769 - trunk/www/firefox/files Message-ID: <201411221043.sAMAhGPI085334@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Nov 22 10:43:16 2014
New Revision: 1769
Log:
backport a few gtk3 fixes
Added:
trunk/www/firefox/files/patch-bug1097592
trunk/www/firefox/files/patch-bug877605
Added: trunk/www/firefox/files/patch-bug1097592
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug1097592 Sat Nov 22 10:43:16 2014 (r1769)
@@ -0,0 +1,41 @@
+commit a822f9a
+Author: Martin Stransky <stransky@redhat.com>
+Date: Fri Nov 14 06:32:00 2014 +0100
+
+ Bug 1097592 - Don't use PR_FindFunctionSymbolAndLibrary to avoid app freeze, r=karlt
+---
+ widget/gtk/mozgtk/mozgtk.c | 1 +
+ widget/gtk/nsWindow.cpp | 8 +-------
+ 2 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git widget/gtk/mozgtk/mozgtk.c widget/gtk/mozgtk/mozgtk.c
+index 11829d7..3b46759 100644
+--- widget/gtk/mozgtk/mozgtk.c
++++ widget/gtk/mozgtk/mozgtk.c
+@@ -121,6 +121,7 @@ STUB(gdk_x11_lookup_xdisplay)
+ STUB(gdk_x11_screen_get_xscreen)
+ STUB(gdk_x11_visual_get_xvisual)
+ STUB(gdk_x11_window_lookup_for_display)
++STUB(gdk_x11_window_set_user_time)
+ STUB(gdk_x11_xatom_to_atom)
+ STUB(gtk_accel_label_new)
+ STUB(gtk_alignment_get_type)
+diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
+index 26c333b..d462f13 100644
+--- widget/gtk/nsWindow.cpp
++++ widget/gtk/nsWindow.cpp
+@@ -1295,13 +1295,7 @@ SetUserTimeAndStartupIDForActivatedWindow(GtkWidget* aWindow)
+ }
+
+ if (sn_launchee_context_get_id_has_timestamp(ctx)) {
+- PRLibrary* gtkLibrary;
+- SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc)
+- PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", >kLibrary);
+- if (setUserTimeFunc) {
+- setUserTimeFunc(gdkWindow, sn_launchee_context_get_timestamp(ctx));
+- PR_UnloadLibrary(gtkLibrary);
+- }
++ gdk_x11_window_set_user_time(gdkWindow, sn_launchee_context_get_timestamp(ctx));
+ }
+
+ sn_launchee_context_setup_window(ctx, gdk_x11_window_get_xid(gdkWindow));
Added: trunk/www/firefox/files/patch-bug877605
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug877605 Sat Nov 22 10:43:16 2014 (r1769)
@@ -0,0 +1,305 @@
+commit d7cc508
+Author: Martin Stransky <stransky@redhat.com>
+Date: Thu Sep 4 05:17:00 2014 +0200
+
+ Bug 877605 - GTK3 - fixed tab widget rendering. r=karlt
+---
+ widget/gtk/gtk2drawing.c | 18 ++++++
+ widget/gtk/gtk3drawing.c | 121 ++++++++++++++++++++++++++++++----------
+ widget/gtk/gtkdrawing.h | 13 +++++
+ widget/gtk/nsNativeThemeGTK.cpp | 20 ++++---
+ 4 files changed, 136 insertions(+), 36 deletions(-)
+
+diff --git widget/gtk/gtk2drawing.c widget/gtk/gtk2drawing.c
+index 71e1929..290a17a 100644
+--- widget/gtk/gtk2drawing.c
++++ widget/gtk/gtk2drawing.c
+@@ -3013,6 +3013,24 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
+ }
+
+ gint
++moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom,
++ GtkTextDirection direction, GtkTabFlags flags)
++{
++ moz_gtk_get_widget_border(MOZ_GTK_TAB, left, top,
++ right, bottom, direction,
++ FALSE);
++
++ // Top tabs have no bottom border, bottom tabs have no top border
++ if (flags & MOZ_GTK_TAB_BOTTOM) {
++ *top = 0;
++ } else {
++ *bottom = 0;
++ }
++
++ return MOZ_GTK_SUCCESS;
++}
++
++gint
+ moz_gtk_get_combo_box_entry_button_size(gint* width, gint* height)
+ {
+ /*
+diff --git widget/gtk/gtk3drawing.c widget/gtk/gtk3drawing.c
+index 684650d..e9e21b1 100644
+--- widget/gtk/gtk3drawing.c
++++ widget/gtk/gtk3drawing.c
+@@ -2105,6 +2105,21 @@ moz_gtk_get_tab_thickness(void)
+ return border.top;
+ }
+
++static void
++moz_gtk_tab_prepare_style_context(GtkStyleContext *style,
++ GtkTabFlags flags)
++{
++ gtk_style_context_set_state(style, ((flags & MOZ_GTK_TAB_SELECTED) == 0) ?
++ GTK_STATE_FLAG_NORMAL :
++ GTK_STATE_FLAG_ACTIVE);
++ gtk_style_context_add_region(style, GTK_STYLE_REGION_TAB,
++ (flags & MOZ_GTK_TAB_FIRST) ?
++ GTK_REGION_FIRST : 0);
++ gtk_style_context_add_class(style, (flags & MOZ_GTK_TAB_BOTTOM) ?
++ GTK_STYLE_CLASS_BOTTOM :
++ GTK_STYLE_CLASS_TOP);
++}
++
+ /* actual small tabs */
+ static gint
+ moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect,
+@@ -2117,22 +2132,35 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect,
+ * tab appear physically attached to the tabpanel; see details below. */
+
+ GtkStyleContext* style;
++ GdkRectangle tabRect;
+ GdkRectangle focusRect;
+ GdkRectangle backRect;
++ int initial_gap = 0;
+
+ ensure_tab_widget();
+ gtk_widget_set_direction(gTabWidget, direction);
+
+ style = gtk_widget_get_style_context(gTabWidget);
+- backRect = focusRect = *rect;
+-
+ gtk_style_context_save(style);
++ moz_gtk_tab_prepare_style_context(style, flags);
++
++ tabRect = *rect;
++
++ if (flags & MOZ_GTK_TAB_FIRST) {
++ gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL);
++ tabRect.width -= initial_gap;
++
++ if (direction != GTK_TEXT_DIR_RTL) {
++ tabRect.x += initial_gap;
++ }
++ }
++
++ focusRect = backRect = tabRect;
+
+ if ((flags & MOZ_GTK_TAB_SELECTED) == 0) {
+ /* Only draw the tab */
+- gtk_style_context_set_state(style, GTK_STATE_FLAG_NORMAL);
+ gtk_render_extension(style, cr,
+- rect->x, rect->y, rect->width, rect->height,
++ tabRect.x, tabRect.y, tabRect.width, tabRect.height,
+ (flags & MOZ_GTK_TAB_BOTTOM) ?
+ GTK_POS_TOP : GTK_POS_BOTTOM );
+ } else {
+@@ -2186,24 +2214,19 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect,
+ gap_loffset = gap_roffset = 20; /* should be enough */
+ if (flags & MOZ_GTK_TAB_FIRST) {
+ if (direction == GTK_TEXT_DIR_RTL)
+- gap_roffset = 0;
++ gap_roffset = initial_gap;
+ else
+- gap_loffset = 0;
++ gap_loffset = initial_gap;
+ }
+
+- gtk_style_context_set_state(style, GTK_STATE_FLAG_ACTIVE);
+-
+- /* Adwaita theme engine crashes without it (rhbz#713764) */
+- gtk_style_context_add_region(style, GTK_STYLE_REGION_TAB, 0);
+-
+ if (flags & MOZ_GTK_TAB_BOTTOM) {
+ /* Draw the tab on bottom */
+ focusRect.y += gap_voffset;
+ focusRect.height -= gap_voffset;
+
+ gtk_render_extension(style, cr,
+- rect->x, rect->y + gap_voffset, rect->width,
+- rect->height - gap_voffset, GTK_POS_TOP);
++ tabRect.x, tabRect.y + gap_voffset, tabRect.width,
++ tabRect.height - gap_voffset, GTK_POS_TOP);
+
+ gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
+
+@@ -2219,38 +2242,39 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect,
+ cairo_clip(cr);
+
+ gtk_render_frame_gap(style, cr,
+- rect->x - gap_loffset,
+- rect->y + gap_voffset - 3 * gap_height,
+- rect->width + gap_loffset + gap_roffset,
++ tabRect.x - gap_loffset,
++ tabRect.y + gap_voffset - 3 * gap_height,
++ tabRect.width + gap_loffset + gap_roffset,
+ 3 * gap_height, GTK_POS_BOTTOM,
+- gap_loffset, gap_loffset + rect->width);
++ gap_loffset, gap_loffset + tabRect.width);
+ cairo_restore(cr);
+ } else {
+ /* Draw the tab on top */
+ focusRect.height -= gap_voffset;
+ gtk_render_extension(style, cr,
+- rect->x, rect->y, rect->width,
+- rect->height - gap_voffset, GTK_POS_BOTTOM);
++ tabRect.x, tabRect.y, tabRect.width,
++ tabRect.height - gap_voffset, GTK_POS_BOTTOM);
+
+ gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB);
+
+- backRect.y += (rect->height - gap_voffset);
++ backRect.y += (tabRect.height - gap_voffset);
+ backRect.height = gap_height;
+
+ /* Draw the gap; erase with background color before painting in
+ * case theme does not */
+ gtk_render_background(style, cr, backRect.x, backRect.y,
+ backRect.width, backRect.height);
++
+ cairo_save(cr);
+ cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height);
+ cairo_clip(cr);
+
+ gtk_render_frame_gap(style, cr,
+- rect->x - gap_loffset,
+- rect->y + rect->height - gap_voffset,
+- rect->width + gap_loffset + gap_roffset,
++ tabRect.x - gap_loffset,
++ tabRect.y + tabRect.height - gap_voffset,
++ tabRect.width + gap_loffset + gap_roffset,
+ 3 * gap_height, GTK_POS_TOP,
+- gap_loffset, gap_loffset + rect->width);
++ gap_loffset, gap_loffset + tabRect.width);
+ cairo_restore(cr);
+ }
+ }
+@@ -2885,10 +2909,6 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
+ left, top, right, bottom);
+ return MOZ_GTK_SUCCESS;
+ }
+- case MOZ_GTK_TAB:
+- ensure_tab_widget();
+- w = gTabWidget;
+- break;
+ /* These widgets have no borders, since they are not containers. */
+ case MOZ_GTK_SPLITTER_HORIZONTAL:
+ case MOZ_GTK_SPLITTER_VERTICAL:
+@@ -2932,6 +2952,51 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
+ }
+
+ gint
++moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom,
++ GtkTextDirection direction, GtkTabFlags flags)
++{
++ GtkStyleContext* style;
++ int tab_curvature;
++
++ ensure_tab_widget();
++
++ style = gtk_widget_get_style_context(gTabWidget);
++ gtk_style_context_save(style);
++ moz_gtk_tab_prepare_style_context(style, flags);
++
++ // TODO add_style_border() should be replaced
++ // with focus-line-width and focus-padding
++ // see Bug 877605
++ *left = *top = *right = *bottom = 0;
++ moz_gtk_add_style_border(style, left, top, right, bottom);
++ moz_gtk_add_style_padding(style, left, top, right, bottom);
++
++ gtk_widget_style_get (gTabWidget, "tab-curvature", &tab_curvature, NULL);
++ *left += tab_curvature;
++ *right += tab_curvature;
++
++ if (flags & MOZ_GTK_TAB_FIRST) {
++ int initial_gap;
++ gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL);
++ if (direction == GTK_TEXT_DIR_RTL)
++ *right += initial_gap;
++ else
++ *left += initial_gap;
++ }
++
++ // Top tabs have no bottom border, bottom tabs have no top border
++ if (flags & MOZ_GTK_TAB_BOTTOM) {
++ *top = 0;
++ } else {
++ *bottom = 0;
++ }
++
++ gtk_style_context_restore(style);
++
++ return MOZ_GTK_SUCCESS;
++}
++
++gint
+ moz_gtk_get_combo_box_entry_button_size(gint* width, gint* height)
+ {
+ /*
+diff --git widget/gtk/gtkdrawing.h widget/gtk/gtkdrawing.h
+index fb11105..1938e8f 100644
+--- widget/gtk/gtkdrawing.h
++++ widget/gtk/gtkdrawing.h
+@@ -259,6 +259,19 @@ gint moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
+ gboolean inhtml);
+
+ /**
++ * Get the border size of a notebook tab
++ * left/right: [OUT] the tab's left/right border
++ * top/bottom: [OUT] the tab's top/bottom border
++ * direction: the text direction for the widget
++ * flags: tab-dependant flags; see the GtkTabFlags definition.
++ *
++ * returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise
++ */
++gint
++moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom,
++ GtkTextDirection direction, GtkTabFlags flags);
++
++/**
+ * Get the desired size of a GtkCheckButton
+ * indicator_size: [OUT] the indicator size
+ * indicator_spacing: [OUT] the spacing between the indicator and its
+diff --git widget/gtk/nsNativeThemeGTK.cpp widget/gtk/nsNativeThemeGTK.cpp
+index 969fb0a..62018e5 100644
+--- widget/gtk/nsNativeThemeGTK.cpp
++++ widget/gtk/nsNativeThemeGTK.cpp
+@@ -940,14 +940,18 @@ nsNativeThemeGTK::GetWidgetBorder(nsDeviceContext* aContext, nsIFrame* aFrame,
+ // but don't reserve any space for it.
+ break;
+ case NS_THEME_TAB:
+- // Top tabs have no bottom border, bottom tabs have no top border
+- moz_gtk_get_widget_border(MOZ_GTK_TAB, &aResult->left, &aResult->top,
+- &aResult->right, &aResult->bottom, direction,
+- FALSE);
+- if (IsBottomTab(aFrame))
+- aResult->top = 0;
+- else
+- aResult->bottom = 0;
++ {
++ GtkThemeWidgetType gtkWidgetType;
++ gint flags;
++
++ if (!GetGtkWidgetAndState(aWidgetType, aFrame, gtkWidgetType, nullptr,
++ &flags))
++ return NS_OK;
++
++ moz_gtk_get_tab_border(&aResult->left, &aResult->top,
++ &aResult->right, &aResult->bottom, direction,
++ (GtkTabFlags)flags);
++ }
+ break;
+ case NS_THEME_MENUITEM:
+ case NS_THEME_CHECKMENUITEM:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411221043.sAMAhGPI085334>