From 097e888403d91ac091a2bec837eaf7002c18e00a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Fri, 30 Jun 2017 14:01:59 +0200 Subject: [PATCH] window: Move updates debugging to GtkWidget Which has the necessary information. --- gtk/gtkwidget.c | 2 ++ gtk/gtkwindow.c | 12 ------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 81f6fdd38c..5b7943d7c0 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -72,6 +72,7 @@ #include "gtkrenderborderprivate.h" #include "gtkrenderbackgroundprivate.h" #include "gtkcssshadowsvalueprivate.h" +#include "gtkdebugupdatesprivate.h" #include "inspector/window.h" @@ -4913,6 +4914,7 @@ gtk_widget_real_queue_draw_region (GtkWidget *widget, const cairo_region_t *region) { g_assert (_gtk_widget_get_has_window (widget)); + gtk_debug_updates_add (widget, region); gdk_window_invalidate_region (_gtk_widget_get_window (widget), region, TRUE); } diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index e235b1be72..f0219f3f09 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -513,8 +513,6 @@ static void gtk_window_do_popup (GtkWindow *window, static void gtk_window_style_updated (GtkWidget *widget); static void gtk_window_state_flags_changed (GtkWidget *widget, GtkStateFlags previous_state); -static void gtk_window_queue_draw_region (GtkWidget *widget, - const cairo_region_t *region); static GSList *toplevel_list = NULL; static guint window_signals[LAST_SIGNAL] = { 0 }; @@ -827,7 +825,6 @@ gtk_window_class_init (GtkWindowClass *klass) widget_class->state_flags_changed = gtk_window_state_flags_changed; widget_class->style_updated = gtk_window_style_updated; widget_class->snapshot = gtk_window_snapshot; - widget_class->queue_draw_region = gtk_window_queue_draw_region; widget_class->pick = gtk_window_pick; container_class->add = gtk_window_add; @@ -7823,15 +7820,6 @@ gtk_window_style_updated (GtkWidget *widget) update_themed_icon (GTK_WINDOW (widget)); } -static void -gtk_window_queue_draw_region (GtkWidget *widget, - const cairo_region_t *region) -{ - gtk_debug_updates_add (widget, region); - - GTK_WIDGET_CLASS (gtk_window_parent_class)->queue_draw_region (widget, region); -} - /** * _gtk_window_unset_focus_and_default: * @window: a #GtkWindow