[gtk/wip/baedert/for-master: 133/135] snapshot: Use collect_default directoy in push_debug()

[Timm Bäder <baedert src gnome org>]

commit 720c298786d38437ae61848f6ebbeeb5674eb630
Author: Timm Bäder <mail baedert org>
Date:   Sun Jul 12 11:33:34 2020 +0200

    snapshot: Use collect_default directoy in push_debug()
    
    Instead of going through collect_debug and then doing a collect_default
    anyway if the message is NULL.

 gtk/gtksnapshot.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtksnapshot.c b/gtk/gtksnapshot.c
index 5c80b694eb..b9c99ffb83 100644
--- a/gtk/gtksnapshot.c
+++ b/gtk/gtksnapshot.c
@@ -351,9 +351,6 @@ gtk_snapshot_collect_debug (GtkSnapshot      *snapshot,
   if (node == NULL)
     return NULL;
 
-  if (state->data.debug.message == NULL)
-    return node;
-
   debug_node = gsk_debug_node_new (node, state->data.debug.message);
 
   gsk_render_node_unref (node);
@@ -377,15 +374,17 @@ gtk_snapshot_push_debug (GtkSnapshot *snapshot,
                          ...)
 {
   GtkSnapshotState *current_state = gtk_snapshot_get_current_state (snapshot);
-  GtkSnapshotState *state;
-
-  state = gtk_snapshot_push_state (snapshot,
-                                   current_state->transform,
-                                   gtk_snapshot_collect_debug);
 
   if (GTK_DEBUG_CHECK (SNAPSHOT))
     {
       va_list args;
+      GtkSnapshotState *state;
+
+      state = gtk_snapshot_push_state (snapshot,
+                                       current_state->transform,
+                                       gtk_snapshot_collect_debug);
+
+
 
       va_start (args, message);
       state->data.debug.message = g_strdup_vprintf (message, args);
@@ -393,7 +392,9 @@ gtk_snapshot_push_debug (GtkSnapshot *snapshot,
     }
   else
     {
-      state->data.debug.message = NULL;
+      gtk_snapshot_push_state (snapshot,
+                               current_state->transform,
+                               gtk_snapshot_collect_default);
     }
 }
 
@@ -1822,7 +1823,7 @@ gtk_snapshot_render_layout (GtkSnapshot     *snapshot,
   fg_color = gtk_css_color_value_get_rgba (_gtk_style_context_peek_property (context, 
GTK_CSS_PROPERTY_COLOR));
 
   shadows_value = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_TEXT_SHADOW);
-    has_shadow = gtk_css_shadow_value_push_snapshot (shadows_value, snapshot);
+  has_shadow = gtk_css_shadow_value_push_snapshot (shadows_value, snapshot);
 
   gtk_snapshot_append_layout (snapshot, layout, fg_color);