[gtk+/wip/cssvalue: 81/137] stylecontext: Keep the main style data around until revalidation

[Benjamin Otte <otte src gnome org>]

commit 082f126cc03a7f3a1fbb9986ca9365f941f7e3c6
Author: Benjamin Otte <otte redhat com>
Date:   Thu Mar 29 15:43:35 2012 +0200

    stylecontext: Keep the main style data around until revalidation

 gtk/gtkstylecontext.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index afcdb65..5f25f62 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -1055,9 +1055,11 @@ gtk_style_context_queue_invalidate_internal (GtkStyleContext *context,
   GtkStyleContextPrivate *priv = context->priv;
   GtkStyleInfo *info = priv->info_stack->data;
 
-  info->data = NULL;
-  
-  if (!gtk_style_context_is_saved (context))
+  if (gtk_style_context_is_saved (context))
+    {
+      info->data = NULL;
+    }
+  else
     {
       _gtk_style_context_queue_invalidate (context, GTK_CSS_CHANGE_STATE);
       /* XXX: We need to invalidate siblings here somehow */
@@ -3345,8 +3347,10 @@ _gtk_style_context_validate (GtkStyleContext *context,
 
   if (priv->relevant_changes & change)
     {
+      GtkStyleInfo *info = priv->info_stack->data;
       gboolean clear_cache = ((priv->relevant_changes & change) & ~GTK_STYLE_CONTEXT_CACHED_CHANGE) != 0;
 
+      info->data = NULL;
       gtk_style_context_do_invalidate (context, clear_cache);
     }