[gtk+/wip/ebassi/gsk-renderer: 84/126] box: Port from immediate to deferred rendering

[Emmanuele Bassi <ebassi src gnome org>]

commit fcd1d32e658c6f36e2854e8260bf2d2833a6858e
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Aug 2 18:44:06 2016 +0100

    box: Port from immediate to deferred rendering
    
    Drop the ::draw() vfunc implementation in favour of the
    ::get_render_node() vfunc.

 gtk/gtkbox.c |   37 +++++++++++++++----------------------
 1 files changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index e39eb49..05cd6ac 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -167,8 +167,6 @@ struct _GtkBoxChild
 
 static void gtk_box_size_allocate         (GtkWidget              *widget,
                                            GtkAllocation          *allocation);
-static gboolean gtk_box_draw           (GtkWidget        *widget,
-                                        cairo_t          *cr);
 
 static void gtk_box_direction_changed  (GtkWidget        *widget,
                                         GtkTextDirection  previous_direction);
@@ -226,6 +224,9 @@ static void  gtk_box_get_preferred_height_and_baseline_for_width (GtkWidget
                                                                  gint                *minimum_baseline,
                                                                  gint                *natural_baseline);
 
+static GskRenderNode *  gtk_box_get_render_node                 (GtkWidget            *widget,
+                                                                 GskRenderer          *renderer);
+
 static void               gtk_box_buildable_init                 (GtkBuildableIface  *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
@@ -255,7 +256,7 @@ gtk_box_class_init (GtkBoxClass *class)
   object_class->get_property = gtk_box_get_property;
   object_class->dispose = gtk_box_dispose;
 
-  widget_class->draw                           = gtk_box_draw;
+  widget_class->get_render_node                = gtk_box_get_render_node;
   widget_class->size_allocate                  = gtk_box_size_allocate;
   widget_class->get_preferred_width            = gtk_box_get_preferred_width;
   widget_class->get_preferred_height           = gtk_box_get_preferred_height;
@@ -436,30 +437,22 @@ gtk_box_get_property (GObject    *object,
     }
 }
 
-static gboolean
-gtk_box_draw_contents (GtkCssGadget *gadget,
-                       cairo_t      *cr,
-                       int           x,
-                       int           y,
-                       int           width,
-                       int           height,
-                       gpointer      unused)
+static GskRenderNode *
+gtk_box_get_render_node (GtkWidget   *widget,
+                         GskRenderer *renderer)
 {
-  GTK_WIDGET_CLASS (gtk_box_parent_class)->draw (gtk_css_gadget_get_owner (gadget), cr);
+  GskRenderNode *res = gtk_css_gadget_get_render_node (GTK_BOX (widget)->priv->gadget,
+                                                       renderer,
+                                                       FALSE);
 
-  return FALSE;
-}
+  if (res == NULL)
+    return NULL;
 
-static gboolean
-gtk_box_draw (GtkWidget *widget,
-              cairo_t   *cr)
-{
-  gtk_css_gadget_draw (GTK_BOX (widget)->priv->gadget, cr);
+  gtk_container_propagate_render_node (GTK_CONTAINER (widget), renderer, res);
 
-  return FALSE;
+  return res;
 }
 
-
 static void
 count_expand_children (GtkBox *box,
                        gint *visible_children,
@@ -2107,7 +2100,7 @@ gtk_box_init (GtkBox *box)
                                                         GTK_WIDGET (box),
                                                         gtk_box_get_content_size,
                                                         gtk_box_allocate_contents,
-                                                        gtk_box_draw_contents,
+                                                        NULL,
                                                         NULL,
                                                         NULL);