From: Timm Bäder <mail@baedert.org>
Date: Sat, 24 Aug 2019 08:09:41 +0000 (+0200)
Subject: cssnode: GtkCssAnimatedStyle->style is always a static style
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~945
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=514e60c1bb4ef1d0c5d6f74d102eb14a1d09da48;p=gtk4.git

cssnode: GtkCssAnimatedStyle->style is always a static style
---

diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c
index 039791e873..0cce324e05 100644
--- a/gtk/gtkcssnode.c
+++ b/gtk/gtkcssnode.c
@@ -25,6 +25,7 @@
 #include "gtkmarshalers.h"
 #include "gtksettingsprivate.h"
 #include "gtktypebuiltins.h"
+#include "gtkprivate.h"
 
 /*
  * CSS nodes are the backbone of the GtkStyleContext implementation and
@@ -386,13 +387,12 @@ static gboolean
 gtk_css_style_needs_recreation (GtkCssStyle  *style,
                                 GtkCssChange  change)
 {
+  gtk_internal_return_val_if_fail (GTK_IS_CSS_STATIC_STYLE (style), TRUE);
+
   /* Try to avoid invalidating if we can */
   if (change & GTK_CSS_RADICAL_CHANGE)
     return TRUE;
 
-  if (GTK_IS_CSS_ANIMATED_STYLE (style))
-    style = GTK_CSS_ANIMATED_STYLE (style)->style;
-
   if (gtk_css_static_style_get_change (GTK_CSS_STATIC_STYLE (style)) & change)
     return TRUE;
   else