Merge branch 'wip/otte/for-master' into 'master'

Wip/otte/for master

See merge request GNOME/gtk!2855

6 files changed, 168 insertions, 168 deletions

diff --git a/gsk/broadway/gskbroadwayrenderer.c b/gsk/broadway/gskbroadwayrenderer.c
index e2b43146fe..80a3f84968 100644
--- a/gsk/broadway/gskbroadwayrenderer.c
+++ b/gsk/broadway/gskbroadwayrenderer.c
@@ -583,7 +583,7 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
     case GSK_CAIRO_NODE:
       if (add_new_node (renderer, node, BROADWAY_NODE_TEXTURE, clip_bounds))
         {
-          cairo_surface_t *surface = gsk_cairo_node_peek_surface (node);
+          cairo_surface_t *surface = gsk_cairo_node_get_surface (node);
           cairo_surface_t *image_surface = NULL;
           GdkTexture *texture;
           guint32 texture_id;
@@ -620,7 +620,7 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
       if (add_new_node (renderer, node, BROADWAY_NODE_COLOR, clip_bounds))
         {
           add_rect (nodes, &node->bounds, offset_x, offset_y);
-          add_rgba (nodes, gsk_color_node_peek_color (node));
+          add_rgba (nodes, gsk_color_node_get_color (node));
         }
       return;
 
@@ -628,19 +628,19 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
       if (add_new_node (renderer, node, BROADWAY_NODE_BORDER, clip_bounds))
         {
           int i;
-          add_rounded_rect (nodes, gsk_border_node_peek_outline (node), offset_x, offset_y);
+          add_rounded_rect (nodes, gsk_border_node_get_outline (node), offset_x, offset_y);
           for (i = 0; i < 4; i++)
-            add_float (nodes, gsk_border_node_peek_widths (node)[i]);
+            add_float (nodes, gsk_border_node_get_widths (node)[i]);
           for (i = 0; i < 4; i++)
-            add_rgba (nodes, &gsk_border_node_peek_colors (node)[i]);
+            add_rgba (nodes, &gsk_border_node_get_colors (node)[i]);
         }
       return;
 
     case GSK_OUTSET_SHADOW_NODE:
       if (add_new_node (renderer, node, BROADWAY_NODE_OUTSET_SHADOW, clip_bounds))
         {
-          add_rounded_rect (nodes, gsk_outset_shadow_node_peek_outline (node), offset_x, offset_y);
-          add_rgba (nodes, gsk_outset_shadow_node_peek_color (node));
+          add_rounded_rect (nodes, gsk_outset_shadow_node_get_outline (node), offset_x, offset_y);
+          add_rgba (nodes, gsk_outset_shadow_node_get_color (node));
           add_float (nodes, gsk_outset_shadow_node_get_dx (node));
           add_float (nodes, gsk_outset_shadow_node_get_dy (node));
           add_float (nodes, gsk_outset_shadow_node_get_spread (node));
@@ -651,8 +651,8 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
     case GSK_INSET_SHADOW_NODE:
       if (add_new_node (renderer, node, BROADWAY_NODE_INSET_SHADOW, clip_bounds))
         {
-          add_rounded_rect (nodes, gsk_inset_shadow_node_peek_outline (node), offset_x, offset_y);
-          add_rgba (nodes, gsk_inset_shadow_node_peek_color (node));
+          add_rounded_rect (nodes, gsk_inset_shadow_node_get_outline (node), offset_x, offset_y);
+          add_rgba (nodes, gsk_inset_shadow_node_get_color (node));
           add_float (nodes, gsk_inset_shadow_node_get_dx (node));
           add_float (nodes, gsk_inset_shadow_node_get_dy (node));
           add_float (nodes, gsk_inset_shadow_node_get_spread (node));
@@ -666,12 +666,12 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
           guint i, n;
 
           add_rect (nodes, &node->bounds, offset_x, offset_y);
-          add_point (nodes, gsk_linear_gradient_node_peek_start (node), offset_x, offset_y);
-          add_point (nodes, gsk_linear_gradient_node_peek_end (node), offset_x, offset_y);
+          add_point (nodes, gsk_linear_gradient_node_get_start (node), offset_x, offset_y);
+          add_point (nodes, gsk_linear_gradient_node_get_end (node), offset_x, offset_y);
           n = gsk_linear_gradient_node_get_n_color_stops (node);
           add_uint32 (nodes, n);
           for (i = 0; i < n; i++)
-            add_color_stop (nodes, &gsk_linear_gradient_node_peek_color_stops (node, NULL)[i]);
+            add_color_stop (nodes, &gsk_linear_gradient_node_get_color_stops (node, NULL)[i]);
         }
       return;
 
@@ -685,7 +685,7 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
           add_uint32 (nodes, n_shadows);
           for (i = 0; i < n_shadows; i++)
             {
-              const GskShadow *shadow = gsk_shadow_node_peek_shadow (node, i);
+              const GskShadow *shadow = gsk_shadow_node_get_shadow (node, i);
               add_rgba (nodes, &shadow->color);
               add_float (nodes, shadow->dx);
               add_float (nodes, shadow->dy);
@@ -710,7 +710,7 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
     case GSK_ROUNDED_CLIP_NODE:
       if (add_new_node (renderer, node, BROADWAY_NODE_ROUNDED_CLIP, clip_bounds))
         {
-          const GskRoundedRect *rclip = gsk_rounded_clip_node_peek_clip (node);
+          const GskRoundedRect *rclip = gsk_rounded_clip_node_get_clip (node);
           graphene_rect_t child_bounds = rclip->bounds;
 
           if (clip_bounds)
@@ -728,7 +728,7 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
     case GSK_CLIP_NODE:
       if (add_new_node (renderer, node, BROADWAY_NODE_CLIP, clip_bounds))
         {
-          const graphene_rect_t *clip = gsk_clip_node_peek_clip (node);
+          const graphene_rect_t *clip = gsk_clip_node_get_clip (node);
           graphene_rect_t child_bounds = *clip;
 
           if (clip_bounds)
@@ -828,8 +828,8 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
         GskRenderNode *child = gsk_color_matrix_node_get_child (node);
         if (gsk_render_node_get_node_type (child) == GSK_TEXTURE_NODE)
           {
-            const graphene_matrix_t *color_matrix = gsk_color_matrix_node_peek_color_matrix (node);
-            const graphene_vec4_t *color_offset = gsk_color_matrix_node_peek_color_offset (node);
+            const graphene_matrix_t *color_matrix = gsk_color_matrix_node_get_color_matrix (node);
+            const graphene_vec4_t *color_offset = gsk_color_matrix_node_get_color_offset (node);
             GdkTexture *texture = gsk_texture_node_get_texture (child);
             GdkTexture *colorized_texture = get_colorized_texture (texture, color_matrix, color_offset);
             if (add_new_node (renderer, node, BROADWAY_NODE_TEXTURE, clip_bounds))
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 15bad5feaa..46fb18e57c 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -128,7 +128,7 @@ print_render_node_tree (GskRenderNode *root, int level)
         break;
 
       case GSK_COLOR_NODE:
-        g_print ("%*s Color %s\n", level * INDENT, " ", gdk_rgba_to_string (gsk_color_node_peek_color (root)));
+        g_print ("%*s Color %s\n", level * INDENT, " ", gdk_rgba_to_string (gsk_color_node_get_color (root)));
         break;
 
       case GSK_SHADOW_NODE:
@@ -291,8 +291,8 @@ init_projection_matrix (graphene_matrix_t     *out_proj,
 static inline gboolean G_GNUC_PURE
 color_matrix_modifies_alpha (GskRenderNode *node)
 {
-  const graphene_matrix_t *matrix = gsk_color_matrix_node_peek_color_matrix (node);
-  const graphene_vec4_t *offset = gsk_color_matrix_node_peek_color_offset (node);
+  const graphene_matrix_t *matrix = gsk_color_matrix_node_get_color_matrix (node);
+  const graphene_vec4_t *offset = gsk_color_matrix_node_get_color_offset (node);
   graphene_vec4_t row3;
 
   if (graphene_vec4_get_w (offset) != 0.0f)
@@ -750,8 +750,8 @@ render_text_node (GskGLRenderer   *self,
                   const GdkRGBA   *color,
                   gboolean         force_color)
 {
-  const PangoFont *font = gsk_text_node_peek_font (node);
-  const PangoGlyphInfo *glyphs = gsk_text_node_peek_glyphs (node, NULL);
+  const PangoFont *font = gsk_text_node_get_font (node);
+  const PangoGlyphInfo *glyphs = gsk_text_node_get_glyphs (node, NULL);
   const float text_scale = ops_get_scale (builder);
   const graphene_point_t *offset = gsk_text_node_get_offset (node);
   const guint num_glyphs = gsk_text_node_get_num_glyphs (node);
@@ -834,9 +834,9 @@ render_border_node (GskGLRenderer   *self,
                     GskRenderNode   *node,
                     RenderOpBuilder *builder)
 {
-  const GdkRGBA *colors = gsk_border_node_peek_colors (node);
-  const GskRoundedRect *rounded_outline = gsk_border_node_peek_outline (node);
-  const float *widths = gsk_border_node_peek_widths (node);
+  const GdkRGBA *colors = gsk_border_node_get_colors (node);
+  const GskRoundedRect *rounded_outline = gsk_border_node_get_outline (node);
+  const float *widths = gsk_border_node_get_widths (node);
   int i;
   struct {
     float w;
@@ -975,7 +975,7 @@ render_color_node (GskGLRenderer   *self,
                    RenderOpBuilder *builder)
 {
   ops_set_program (builder, &self->programs->color_program);
-  ops_set_color (builder, gsk_color_node_peek_color (node));
+  ops_set_color (builder, gsk_color_node_get_color (node));
   load_vertex_data (ops_draw (builder, NULL), &node->bounds, builder);
 }
 
@@ -1426,9 +1426,9 @@ render_linear_gradient_node (GskGLRenderer   *self,
 
   if (n_color_stops < GL_MAX_GRADIENT_STOPS)
     {
-      const GskColorStop *stops = gsk_linear_gradient_node_peek_color_stops (node, NULL);
-      const graphene_point_t *start = gsk_linear_gradient_node_peek_start (node);
-      const graphene_point_t *end = gsk_linear_gradient_node_peek_end (node);
+      const GskColorStop *stops = gsk_linear_gradient_node_get_color_stops (node, NULL);
+      const graphene_point_t *start = gsk_linear_gradient_node_get_start (node);
+      const graphene_point_t *end = gsk_linear_gradient_node_get_end (node);
 
       ops_set_program (builder, &self->programs->linear_gradient_program);
       ops_set_linear_gradient (builder,
@@ -1456,8 +1456,8 @@ render_radial_gradient_node (GskGLRenderer   *self,
 
   if (n_color_stops < GL_MAX_GRADIENT_STOPS)
     {
-      const GskColorStop *stops = gsk_radial_gradient_node_peek_color_stops (node, NULL);
-      const graphene_point_t *center = gsk_radial_gradient_node_peek_center (node);
+      const GskColorStop *stops = gsk_radial_gradient_node_get_color_stops (node, NULL);
+      const graphene_point_t *center = gsk_radial_gradient_node_get_center (node);
       const float start = gsk_radial_gradient_node_get_start (node);
       const float end = gsk_radial_gradient_node_get_end (node);
       const float hradius = gsk_radial_gradient_node_get_hradius (node);
@@ -1628,7 +1628,7 @@ render_clip_node (GskGLRenderer   *self,
                   GskRenderNode   *node,
                   RenderOpBuilder *builder)
 {
-  const graphene_rect_t *clip = gsk_clip_node_peek_clip (node);
+  const graphene_rect_t *clip = gsk_clip_node_get_clip (node);
   GskRenderNode *child = gsk_clip_node_get_child (node);
 
   render_clipped_child (self, builder, clip, child);
@@ -1641,7 +1641,7 @@ render_rounded_clip_node (GskGLRenderer       *self,
 {
   const float scale_x = builder->scale_x;
   const float scale_y = builder->scale_y;
-  const GskRoundedRect *clip = gsk_rounded_clip_node_peek_clip (node);
+  const GskRoundedRect *clip = gsk_rounded_clip_node_get_clip (node);
   GskRenderNode *child = gsk_rounded_clip_node_get_child (node);
   GskRoundedRect transformed_clip;
   gboolean need_offscreen;
@@ -1761,8 +1761,8 @@ render_color_matrix_node (GskGLRenderer       *self,
 
   ops_set_program (builder, &self->programs->color_matrix_program);
   ops_set_color_matrix (builder,
-                        gsk_color_matrix_node_peek_color_matrix (node),
-                        gsk_color_matrix_node_peek_color_offset (node));
+                        gsk_color_matrix_node_get_color_matrix (node),
+                        gsk_color_matrix_node_get_color_offset (node));
 
   ops_set_texture (builder, region.texture_id);
 
@@ -1978,9 +1978,9 @@ render_unblurred_inset_shadow_node (GskGLRenderer   *self,
   g_assert (blur_radius == 0);
 
   ops_set_program (builder, &self->programs->inset_shadow_program);
-  ops_set_inset_shadow (builder, transform_rect (self, builder, gsk_inset_shadow_node_peek_outline (node)),
+  ops_set_inset_shadow (builder, transform_rect (self, builder, gsk_inset_shadow_node_get_outline (node)),
                         spread,
-                        gsk_inset_shadow_node_peek_color (node),
+                        gsk_inset_shadow_node_get_color (node),
                         dx, dy);
 
   load_vertex_data (ops_draw (builder, NULL), &node->bounds, builder);
@@ -1997,7 +1997,7 @@ render_inset_shadow_node (GskGLRenderer   *self,
   const float blur_extra = blur_radius * 2.0; /* 2.0 = shader radius_multiplier */
   const float dx = gsk_inset_shadow_node_get_dx (node);
   const float dy = gsk_inset_shadow_node_get_dy (node);
-  const GskRoundedRect *node_outline = gsk_inset_shadow_node_peek_outline (node);
+  const GskRoundedRect *node_outline = gsk_inset_shadow_node_get_outline (node);
   float texture_width;
   float texture_height;
   int blurred_texture_id;
@@ -2069,7 +2069,7 @@ render_inset_shadow_node (GskGLRenderer   *self,
       ops_set_program (builder, &self->programs->inset_shadow_program);
       ops_set_inset_shadow (builder, transform_rect (self, builder, &outline_to_blur),
                             spread * MAX (scale_x, scale_y),
-                            gsk_inset_shadow_node_peek_color (node),
+                            gsk_inset_shadow_node_get_color (node),
                             dx * scale_x, dy * scale_y);
 
       load_float_vertex_data (ops_draw (builder, NULL), builder,
@@ -2130,7 +2130,7 @@ render_unblurred_outset_shadow_node (GskGLRenderer   *self,
                                      GskRenderNode   *node,
                                      RenderOpBuilder *builder)
 {
-  const GskRoundedRect *outline = gsk_outset_shadow_node_peek_outline (node);
+  const GskRoundedRect *outline = gsk_outset_shadow_node_get_outline (node);
   const float x = node->bounds.origin.x;
   const float y = node->bounds.origin.y;
   const float w = node->bounds.size.width;
@@ -2151,7 +2151,7 @@ render_unblurred_outset_shadow_node (GskGLRenderer   *self,
   ops_set_program (builder, &self->programs->unblurred_outset_shadow_program);
   ops_set_unblurred_outset_shadow (builder, transform_rect (self, builder, outline),
                                    spread,
-                                   gsk_outset_shadow_node_peek_color (node),
+                                   gsk_outset_shadow_node_get_color (node),
                                    dx, dy);
 
   /* Corners... */
@@ -2200,8 +2200,8 @@ render_outset_shadow_node (GskGLRenderer   *self,
   const float scale = ops_get_scale (builder);
   const float scale_x = builder->scale_x;
   const float scale_y = builder->scale_y;
-  const GskRoundedRect *outline = gsk_outset_shadow_node_peek_outline (node);
-  const GdkRGBA *color = gsk_outset_shadow_node_peek_color (node);
+  const GskRoundedRect *outline = gsk_outset_shadow_node_get_outline (node);
+  const GdkRGBA *color = gsk_outset_shadow_node_get_color (node);
   const float blur_radius = gsk_outset_shadow_node_get_blur_radius (node);
   const float blur_extra = blur_radius * 2.0f; /* 2.0 = shader radius_multiplier */
   const int extra_blur_pixels = (int) ceilf(blur_extra / 2.0 * scale);
@@ -2529,7 +2529,7 @@ render_shadow_node (GskGLRenderer   *self,
 
   for (i = 0; i < n_shadows; i ++)
     {
-      const GskShadow *shadow = gsk_shadow_node_peek_shadow (node, i);
+      const GskShadow *shadow = gsk_shadow_node_get_shadow (node, i);
       const float dx = shadow->dx;
       const float dy = shadow->dy;
       TextureRegion region;
@@ -2713,7 +2713,7 @@ render_repeat_node (GskGLRenderer   *self,
                     RenderOpBuilder *builder)
 {
   GskRenderNode *child = gsk_repeat_node_get_child (node);
-  const graphene_rect_t *child_bounds = gsk_repeat_node_peek_child_bounds (node);
+  const graphene_rect_t *child_bounds = gsk_repeat_node_get_child_bounds (node);
   TextureRegion region;
   gboolean is_offscreen;
   OpRepeat *op;
@@ -3663,7 +3663,7 @@ gsk_gl_renderer_add_render_ops (GskGLRenderer   *self,
 
     case GSK_TEXT_NODE:
       render_text_node (self, node, builder,
-                        gsk_text_node_peek_color (node), FALSE);
+                        gsk_text_node_get_color (node), FALSE);
     break;
 
     case GSK_COLOR_MATRIX_NODE:
diff --git a/gsk/gskrendernode.h b/gsk/gskrendernode.h
index 683bf5d9ff..dba436afda 100644
--- a/gsk/gskrendernode.h
+++ b/gsk/gskrendernode.h
@@ -179,7 +179,7 @@ GDK_AVAILABLE_IN_ALL
 GskRenderNode *         gsk_color_node_new                      (const GdkRGBA            *rgba,
                                                                  const graphene_rect_t    *bounds);
 GDK_AVAILABLE_IN_ALL
-const GdkRGBA *         gsk_color_node_peek_color               (GskRenderNode            *node);
+const GdkRGBA *         gsk_color_node_get_color                (GskRenderNode            *node);
 
 GDK_AVAILABLE_IN_ALL
 GType                   gsk_texture_node_get_type               (void) G_GNUC_CONST;
@@ -198,13 +198,13 @@ GskRenderNode *         gsk_linear_gradient_node_new                (const graph
                                                                      const GskColorStop       *color_stops,
                                                                      gsize                     n_color_stops);
 GDK_AVAILABLE_IN_ALL
-const graphene_point_t * gsk_linear_gradient_node_peek_start        (GskRenderNode            *node);
+const graphene_point_t * gsk_linear_gradient_node_get_start         (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const graphene_point_t * gsk_linear_gradient_node_peek_end          (GskRenderNode            *node);
+const graphene_point_t * gsk_linear_gradient_node_get_end           (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
 gsize                    gsk_linear_gradient_node_get_n_color_stops (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const GskColorStop *     gsk_linear_gradient_node_peek_color_stops  (GskRenderNode            *node,
+const GskColorStop *     gsk_linear_gradient_node_get_color_stops   (GskRenderNode            *node,
                                                                      gsize                    *n_stops);
 
 GDK_AVAILABLE_IN_ALL
@@ -230,10 +230,10 @@ GskRenderNode *         gsk_radial_gradient_node_new      (const graphene_rect_t
 GDK_AVAILABLE_IN_ALL
 gsize                   gsk_radial_gradient_node_get_n_color_stops (GskRenderNode *node);
 GDK_AVAILABLE_IN_ALL
-const GskColorStop *    gsk_radial_gradient_node_peek_color_stops  (GskRenderNode *node,
+const GskColorStop *    gsk_radial_gradient_node_get_color_stops   (GskRenderNode *node,
                                                                     gsize         *n_stops);
 GDK_AVAILABLE_IN_ALL
-const graphene_point_t *gsk_radial_gradient_node_peek_center       (GskRenderNode *node);
+const graphene_point_t *gsk_radial_gradient_node_get_center        (GskRenderNode *node);
 GDK_AVAILABLE_IN_ALL
 float                   gsk_radial_gradient_node_get_hradius       (GskRenderNode *node);
 GDK_AVAILABLE_IN_ALL
@@ -262,11 +262,11 @@ GskRenderNode *         gsk_border_node_new                     (const GskRounde
                                                                  const float               border_width[4],
                                                                  const GdkRGBA             border_color[4]);
 GDK_AVAILABLE_IN_ALL
-const GskRoundedRect *  gsk_border_node_peek_outline            (GskRenderNode            *node);
+const GskRoundedRect *  gsk_border_node_get_outline             (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const float *           gsk_border_node_peek_widths             (GskRenderNode            *node);
+const float *           gsk_border_node_get_widths              (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const GdkRGBA *         gsk_border_node_peek_colors             (GskRenderNode            *node);
+const GdkRGBA *         gsk_border_node_get_colors              (GskRenderNode            *node);
 
 GDK_AVAILABLE_IN_ALL
 GType                   gsk_inset_shadow_node_get_type          (void) G_GNUC_CONST;
@@ -278,9 +278,9 @@ GskRenderNode *         gsk_inset_shadow_node_new               (const GskRounde
                                                                  float                     spread,
                                                                  float                     blur_radius);
 GDK_AVAILABLE_IN_ALL
-const GskRoundedRect *  gsk_inset_shadow_node_peek_outline      (GskRenderNode            *node);
+const GskRoundedRect *  gsk_inset_shadow_node_get_outline       (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const GdkRGBA *         gsk_inset_shadow_node_peek_color        (GskRenderNode            *node);
+const GdkRGBA *         gsk_inset_shadow_node_get_color         (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
 float                   gsk_inset_shadow_node_get_dx            (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
@@ -300,9 +300,9 @@ GskRenderNode *         gsk_outset_shadow_node_new              (const GskRounde
                                                                  float                     spread,
                                                                  float                     blur_radius);
 GDK_AVAILABLE_IN_ALL
-const GskRoundedRect *  gsk_outset_shadow_node_peek_outline     (GskRenderNode            *node);
+const GskRoundedRect *  gsk_outset_shadow_node_get_outline      (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const GdkRGBA *         gsk_outset_shadow_node_peek_color       (GskRenderNode            *node);
+const GdkRGBA *         gsk_outset_shadow_node_get_color        (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
 float                   gsk_outset_shadow_node_get_dx           (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
@@ -319,7 +319,7 @@ GskRenderNode *         gsk_cairo_node_new                      (const graphene_
 GDK_AVAILABLE_IN_ALL
 cairo_t *               gsk_cairo_node_get_draw_context         (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-cairo_surface_t *       gsk_cairo_node_peek_surface             (GskRenderNode            *node);
+cairo_surface_t *       gsk_cairo_node_get_surface              (GskRenderNode            *node);
 
 GDK_AVAILABLE_IN_ALL
 GType                   gsk_container_node_get_type             (void) G_GNUC_CONST;
@@ -362,9 +362,9 @@ GDK_AVAILABLE_IN_ALL
 GskRenderNode *         gsk_color_matrix_node_get_child         (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
 const graphene_matrix_t *
-                        gsk_color_matrix_node_peek_color_matrix (GskRenderNode            *node);
+                        gsk_color_matrix_node_get_color_matrix  (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const graphene_vec4_t * gsk_color_matrix_node_peek_color_offset (GskRenderNode            *node);
+const graphene_vec4_t * gsk_color_matrix_node_get_color_offset  (GskRenderNode            *node);
 
 GDK_AVAILABLE_IN_ALL
 GType                   gsk_repeat_node_get_type                (void) G_GNUC_CONST;
@@ -375,7 +375,7 @@ GskRenderNode *         gsk_repeat_node_new                     (const graphene_
 GDK_AVAILABLE_IN_ALL
 GskRenderNode *         gsk_repeat_node_get_child               (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const graphene_rect_t * gsk_repeat_node_peek_child_bounds       (GskRenderNode            *node);
+const graphene_rect_t * gsk_repeat_node_get_child_bounds        (GskRenderNode            *node);
 
 GDK_AVAILABLE_IN_ALL
 GType                   gsk_clip_node_get_type                  (void) G_GNUC_CONST;
@@ -385,7 +385,7 @@ GskRenderNode *         gsk_clip_node_new                       (GskRenderNode
 GDK_AVAILABLE_IN_ALL
 GskRenderNode *         gsk_clip_node_get_child                 (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const graphene_rect_t * gsk_clip_node_peek_clip                 (GskRenderNode            *node);
+const graphene_rect_t * gsk_clip_node_get_clip                  (GskRenderNode            *node);
 
 GDK_AVAILABLE_IN_ALL
 GType                   gsk_rounded_clip_node_get_type          (void) G_GNUC_CONST;
@@ -395,7 +395,7 @@ GskRenderNode *         gsk_rounded_clip_node_new               (GskRenderNode
 GDK_AVAILABLE_IN_ALL
 GskRenderNode *         gsk_rounded_clip_node_get_child         (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const GskRoundedRect *  gsk_rounded_clip_node_peek_clip         (GskRenderNode            *node);
+const GskRoundedRect *  gsk_rounded_clip_node_get_clip          (GskRenderNode            *node);
 
 GDK_AVAILABLE_IN_ALL
 GType                   gsk_shadow_node_get_type                (void) G_GNUC_CONST;
@@ -406,7 +406,7 @@ GskRenderNode *         gsk_shadow_node_new                     (GskRenderNode
 GDK_AVAILABLE_IN_ALL
 GskRenderNode *         gsk_shadow_node_get_child               (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const GskShadow *       gsk_shadow_node_peek_shadow             (GskRenderNode            *node,
+const GskShadow *       gsk_shadow_node_get_shadow              (GskRenderNode            *node,
                                                                  gsize                     i);
 GDK_AVAILABLE_IN_ALL
 gsize                   gsk_shadow_node_get_n_shadows           (GskRenderNode            *node);
@@ -445,15 +445,15 @@ GskRenderNode *         gsk_text_node_new                       (PangoFont
                                                                  const GdkRGBA            *color,
                                                                  const graphene_point_t   *offset);
 GDK_AVAILABLE_IN_ALL
-PangoFont *             gsk_text_node_peek_font                 (GskRenderNode            *node);
+PangoFont *             gsk_text_node_get_font                  (GskRenderNode            *node);
 gboolean                gsk_text_node_has_color_glyphs          (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
 guint                   gsk_text_node_get_num_glyphs            (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
-const PangoGlyphInfo   *gsk_text_node_peek_glyphs               (GskRenderNode            *node,
+const PangoGlyphInfo   *gsk_text_node_get_glyphs                (GskRenderNode            *node,
                                                                  guint                    *n_glyphs);
 GDK_AVAILABLE_IN_ALL
-const GdkRGBA *         gsk_text_node_peek_color                (GskRenderNode            *node);
+const GdkRGBA *         gsk_text_node_get_color                 (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
 const graphene_point_t *gsk_text_node_get_offset                (GskRenderNode            *node);
 
diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c
index b104372baf..e5228d88c9 100644
--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@ -86,7 +86,7 @@ gsk_color_node_diff (GskRenderNode  *node1,
 }
 
 /**
- * gsk_color_node_peek_color:
+ * gsk_color_node_get_color:
  * @node: (type GskColorNode): a #GskColorNode
  *
  * Retrieves the color of the given @node.
@@ -94,7 +94,7 @@ gsk_color_node_diff (GskRenderNode  *node1,
  * Returns: (transfer none): the color of the node
  */
 const GdkRGBA *
-gsk_color_node_peek_color (GskRenderNode *node)
+gsk_color_node_get_color (GskRenderNode *node)
 {
   GskColorNode *self = (GskColorNode *) node;
 
@@ -322,7 +322,7 @@ gsk_repeating_linear_gradient_node_new (const graphene_rect_t  *bounds,
 }
 
 /**
- * gsk_linear_gradient_node_peek_start:
+ * gsk_linear_gradient_node_get_start:
  * @node: (type GskLinearGradientNode): a #GskRenderNode for a linear gradient
  *
  * Retrieves the initial point of the linear gradient.
@@ -330,7 +330,7 @@ gsk_repeating_linear_gradient_node_new (const graphene_rect_t  *bounds,
  * Returns: (transfer none): the initial point
  */
 const graphene_point_t *
-gsk_linear_gradient_node_peek_start (GskRenderNode *node)
+gsk_linear_gradient_node_get_start (GskRenderNode *node)
 {
   GskLinearGradientNode *self = (GskLinearGradientNode *) node;
 
@@ -338,7 +338,7 @@ gsk_linear_gradient_node_peek_start (GskRenderNode *node)
 }
 
 /**
- * gsk_linear_gradient_node_peek_end:
+ * gsk_linear_gradient_node_get_end:
  * @node: (type GskLinearGradientNode): a #GskRenderNode for a linear gradient
  *
  * Retrieves the final point of the linear gradient.
@@ -346,7 +346,7 @@ gsk_linear_gradient_node_peek_start (GskRenderNode *node)
  * Returns: (transfer none): the final point
  */
 const graphene_point_t *
-gsk_linear_gradient_node_peek_end (GskRenderNode *node)
+gsk_linear_gradient_node_get_end (GskRenderNode *node)
 {
   GskLinearGradientNode *self = (GskLinearGradientNode *) node;
 
@@ -370,7 +370,7 @@ gsk_linear_gradient_node_get_n_color_stops (GskRenderNode *node)
 }
 
 /**
- * gsk_linear_gradient_node_peek_color_stops:
+ * gsk_linear_gradient_node_get_color_stops:
  * @node: (type GskLinearGradientNode): a #GskRenderNode for a linear gradient
  * @n_stops: (out) (optional): the number of color stops in the returned array
  *
@@ -379,8 +379,8 @@ gsk_linear_gradient_node_get_n_color_stops (GskRenderNode *node)
  * Returns: (array length=n_stops): the color stops in the gradient
  */
 const GskColorStop *
-gsk_linear_gradient_node_peek_color_stops (GskRenderNode *node,
-                                           gsize         *n_stops)
+gsk_linear_gradient_node_get_color_stops (GskRenderNode *node,
+                                          gsize         *n_stops)
 {
   GskLinearGradientNode *self = (GskLinearGradientNode *) node;
 
@@ -641,7 +641,7 @@ gsk_radial_gradient_node_get_n_color_stops (GskRenderNode *node)
 }
 
 /**
- * gsk_radial_gradient_node_peek_color_stops:
+ * gsk_radial_gradient_node_get_color_stops:
  * @node: (type GskRadialGradientNode): a #GskRenderNode for a radial gradient
  * @n_stops: (out) (optional): the number of color stops in the returned array
  *
@@ -650,8 +650,8 @@ gsk_radial_gradient_node_get_n_color_stops (GskRenderNode *node)
  * Returns: (array length=n_stops): the color stops in the gradient
  */
 const GskColorStop *
-gsk_radial_gradient_node_peek_color_stops (GskRenderNode *node,
-                                           gsize         *n_stops)
+gsk_radial_gradient_node_get_color_stops (GskRenderNode *node,
+                                          gsize         *n_stops)
 {
   GskRadialGradientNode *self = (GskRadialGradientNode *) node;
 
@@ -662,7 +662,7 @@ gsk_radial_gradient_node_peek_color_stops (GskRenderNode *node,
 }
 
 /**
- * gsk_radial_gradient_node_peek_center:
+ * gsk_radial_gradient_node_get_center:
  * @node: (type GskRadialGradientNode): a #GskRenderNode for a radial gradient
  *
  * Retrieves the center pointer for the gradient.
@@ -670,7 +670,7 @@ gsk_radial_gradient_node_peek_color_stops (GskRenderNode *node,
  * Returns: the center point for the gradient
  */
 const graphene_point_t *
-gsk_radial_gradient_node_peek_center (GskRenderNode *node)
+gsk_radial_gradient_node_get_center (GskRenderNode *node)
 {
   GskRadialGradientNode *self = (GskRadialGradientNode *) node;
 
@@ -919,7 +919,7 @@ gsk_border_node_diff (GskRenderNode  *node1,
 }
 
 /**
- * gsk_border_node_peek_outline:
+ * gsk_border_node_get_outline:
  * @node: (type GskBorderNode): a #GskRenderNode for a border
  *
  * Retrieves the outline of the border.
@@ -927,7 +927,7 @@ gsk_border_node_diff (GskRenderNode  *node1,
  * Returns: the outline of the border
  */
 const GskRoundedRect *
-gsk_border_node_peek_outline (GskRenderNode *node)
+gsk_border_node_get_outline (GskRenderNode *node)
 {
   GskBorderNode *self = (GskBorderNode *) node;
 
@@ -935,7 +935,7 @@ gsk_border_node_peek_outline (GskRenderNode *node)
 }
 
 /**
- * gsk_border_node_peek_widths:
+ * gsk_border_node_get_widths:
  * @node: (type GskBorderNode): a #GskRenderNode for a border
  *
  * Retrieves the stroke widths of the border.
@@ -945,7 +945,7 @@ gsk_border_node_peek_outline (GskRenderNode *node)
  *   respectively
  */
 const float *
-gsk_border_node_peek_widths (GskRenderNode *node)
+gsk_border_node_get_widths (GskRenderNode *node)
 {
   GskBorderNode *self = (GskBorderNode *) node;
 
@@ -953,7 +953,7 @@ gsk_border_node_peek_widths (GskRenderNode *node)
 }
 
 /**
- * gsk_border_node_peek_colors:
+ * gsk_border_node_get_colors:
  * @node: (type GskBorderNode): a #GskRenderNode for a border
  *
  * Retrieves the colors of the border.
@@ -962,7 +962,7 @@ gsk_border_node_peek_widths (GskRenderNode *node)
  *     for the top, right, bottom and left color of the border
  */
 const GdkRGBA *
-gsk_border_node_peek_colors (GskRenderNode *node)
+gsk_border_node_get_colors (GskRenderNode *node)
 {
   GskBorderNode *self = (GskBorderNode *) node;
 
@@ -1588,7 +1588,7 @@ gsk_inset_shadow_node_new (const GskRoundedRect *outline,
 }
 
 /**
- * gsk_inset_shadow_node_peek_outline:
+ * gsk_inset_shadow_node_get_outline:
  * @node: (type GskInsetShadowNode): a #GskRenderNode for an inset shadow
  *
  * Retrieves the outline rectangle of the inset shadow.
@@ -1596,7 +1596,7 @@ gsk_inset_shadow_node_new (const GskRoundedRect *outline,
  * Returns: (transfer none): a rounded rectangle
  */
 const GskRoundedRect *
-gsk_inset_shadow_node_peek_outline (GskRenderNode *node)
+gsk_inset_shadow_node_get_outline (GskRenderNode *node)
 {
   GskInsetShadowNode *self = (GskInsetShadowNode *) node;
 
@@ -1606,7 +1606,7 @@ gsk_inset_shadow_node_peek_outline (GskRenderNode *node)
 }
 
 /**
- * gsk_inset_shadow_node_peek_color:
+ * gsk_inset_shadow_node_get_color:
  * @node: (type GskInsetShadowNode): a #GskRenderNode for an inset shadow
  *
  * Retrieves the color of the inset shadow.
@@ -1614,7 +1614,7 @@ gsk_inset_shadow_node_peek_outline (GskRenderNode *node)
  * Returns: (transfer none): the color of the shadow
  */
 const GdkRGBA *
-gsk_inset_shadow_node_peek_color (GskRenderNode *node)
+gsk_inset_shadow_node_get_color (GskRenderNode *node)
 {
   GskInsetShadowNode *self = (GskInsetShadowNode *) node;
 
@@ -1897,7 +1897,7 @@ gsk_outset_shadow_node_new (const GskRoundedRect *outline,
 }
 
 /**
- * gsk_outset_shadow_node_peek_outline:
+ * gsk_outset_shadow_node_get_outline:
  * @node: (type GskOutsetShadowNode): a #GskRenderNode for an outset shadow
  *
  * Retrieves the outline rectangle of the outset shadow.
@@ -1905,7 +1905,7 @@ gsk_outset_shadow_node_new (const GskRoundedRect *outline,
  * Returns: (transfer none): a rounded rectangle
  */
 const GskRoundedRect *
-gsk_outset_shadow_node_peek_outline (GskRenderNode *node)
+gsk_outset_shadow_node_get_outline (GskRenderNode *node)
 {
   GskOutsetShadowNode *self = (GskOutsetShadowNode *) node;
 
@@ -1915,7 +1915,7 @@ gsk_outset_shadow_node_peek_outline (GskRenderNode *node)
 }
 
 /**
- * gsk_outset_shadow_node_peek_color:
+ * gsk_outset_shadow_node_get_color:
  * @node: (type GskOutsetShadowNode): a #GskRenderNode for an outset shadow
  *
  * Retrieves the color of the outset shadow.
@@ -1923,7 +1923,7 @@ gsk_outset_shadow_node_peek_outline (GskRenderNode *node)
  * Returns: (transfer none): a color
  */
 const GdkRGBA *
-gsk_outset_shadow_node_peek_color (GskRenderNode *node)
+gsk_outset_shadow_node_get_color (GskRenderNode *node)
 {
   GskOutsetShadowNode *self = (GskOutsetShadowNode *) node;
 
@@ -2039,7 +2039,7 @@ gsk_cairo_node_draw (GskRenderNode *node,
 }
 
 /**
- * gsk_cairo_node_peek_surface:
+ * gsk_cairo_node_get_surface:
  * @node: (type GskCairoNode): a #GskRenderNode for a Cairo surface
  *
  * Retrieves the Cairo surface used by the render node.
@@ -2047,7 +2047,7 @@ gsk_cairo_node_draw (GskRenderNode *node,
  * Returns: (transfer none): a Cairo surface
  */
 cairo_surface_t *
-gsk_cairo_node_peek_surface (GskRenderNode *node)
+gsk_cairo_node_get_surface (GskRenderNode *node)
 {
   GskCairoNode *self = (GskCairoNode *) node;
 
@@ -2824,7 +2824,7 @@ gsk_color_matrix_node_get_child (GskRenderNode *node)
 }
 
 /**
- * gsk_color_matrix_node_peek_color_matrix:
+ * gsk_color_matrix_node_get_color_matrix:
  * @node: (type GskColorMatrixNode): a color matrix #GskRenderNode
  *
  * Retrieves the color matrix used by the @node.
@@ -2832,7 +2832,7 @@ gsk_color_matrix_node_get_child (GskRenderNode *node)
  * Returns: a 4x4 color matrix
  */
 const graphene_matrix_t *
-gsk_color_matrix_node_peek_color_matrix (GskRenderNode *node)
+gsk_color_matrix_node_get_color_matrix (GskRenderNode *node)
 {
   GskColorMatrixNode *self = (GskColorMatrixNode *) node;
 
@@ -2842,7 +2842,7 @@ gsk_color_matrix_node_peek_color_matrix (GskRenderNode *node)
 }
 
 /**
- * gsk_color_matrix_node_peek_color_offset:
+ * gsk_color_matrix_node_get_color_offset:
  * @node: (type GskColorMatrixNode): a color matrix #GskRenderNode
  *
  * Retrieves the color offset used by the @node.
@@ -2850,7 +2850,7 @@ gsk_color_matrix_node_peek_color_matrix (GskRenderNode *node)
  * Returns: a color vector
  */
 const graphene_vec4_t *
-gsk_color_matrix_node_peek_color_offset (GskRenderNode *node)
+gsk_color_matrix_node_get_color_offset (GskRenderNode *node)
 {
   GskColorMatrixNode *self = (GskColorMatrixNode *) node;
 
@@ -2974,7 +2974,7 @@ gsk_repeat_node_get_child (GskRenderNode *node)
 }
 
 /**
- * gsk_repeat_node_peek_child_bounds:
+ * gsk_repeat_node_get_child_bounds:
  * @node: (type GskRepeatNode): a repeat #GskRenderNode
  *
  * Retrieves the bounding rectangle of the child of @node.
@@ -2982,7 +2982,7 @@ gsk_repeat_node_get_child (GskRenderNode *node)
  * Returns: (transfer none): a bounding rectangle
  */
 const graphene_rect_t *
-gsk_repeat_node_peek_child_bounds (GskRenderNode *node)
+gsk_repeat_node_get_child_bounds (GskRenderNode *node)
 {
   GskRepeatNode *self = (GskRepeatNode *) node;
 
@@ -3104,7 +3104,7 @@ gsk_clip_node_get_child (GskRenderNode *node)
 }
 
 /**
- * gsk_clip_node_peek_clip:
+ * gsk_clip_node_get_clip:
  * @node: (type GskClipNode): a #GskClipNode
  *
  * Retrieves the clip rectangle for @node.
@@ -3112,7 +3112,7 @@ gsk_clip_node_get_child (GskRenderNode *node)
  * Returns: a clip rectangle
  */
 const graphene_rect_t *
-gsk_clip_node_peek_clip (GskRenderNode *node)
+gsk_clip_node_get_clip (GskRenderNode *node)
 {
   GskClipNode *self = (GskClipNode *) node;
 
@@ -3234,7 +3234,7 @@ gsk_rounded_clip_node_get_child (GskRenderNode *node)
 }
 
 /**
- * gsk_rounded_clip_node_peek_clip:
+ * gsk_rounded_clip_node_get_clip:
  * @node: (type GskRoundedClipNode): a rounded clip #GskRenderNode
  *
  * Retrievs the rounded rectangle used to clip the contents of the @node.
@@ -3242,7 +3242,7 @@ gsk_rounded_clip_node_get_child (GskRenderNode *node)
  * Returns: (transfer none): a rounded rectangle
  */
 const GskRoundedRect *
-gsk_rounded_clip_node_peek_clip (GskRenderNode *node)
+gsk_rounded_clip_node_get_clip (GskRenderNode *node)
 {
   GskRoundedClipNode *self = (GskRoundedClipNode *) node;
 
@@ -3452,7 +3452,7 @@ gsk_shadow_node_get_child (GskRenderNode *node)
 }
 
 /**
- * gsk_shadow_node_peek_shadow:
+ * gsk_shadow_node_get_shadow:
  * @node: (type GskShadowNode): a shadow #GskRenderNode
  * @i: the given index
  *
@@ -3461,8 +3461,8 @@ gsk_shadow_node_get_child (GskRenderNode *node)
  * Returns: (transfer none): the shadow data
  */
 const GskShadow *
-gsk_shadow_node_peek_shadow (GskRenderNode *node,
-                             gsize          i)
+gsk_shadow_node_get_shadow (GskRenderNode *node,
+                            gsize          i)
 {
   GskShadowNode *self = (GskShadowNode *) node;
 
@@ -3984,7 +3984,7 @@ gsk_text_node_new (PangoFont              *font,
 }
 
 /**
- * gsk_text_node_peek_color:
+ * gsk_text_node_get_color:
  * @node: (type GskTextNode): a text #GskRenderNode
  *
  * Retrieves the color used by the text @node.
@@ -3992,7 +3992,7 @@ gsk_text_node_new (PangoFont              *font,
  * Returns: (transfer none): the text color
  */
 const GdkRGBA *
-gsk_text_node_peek_color (GskRenderNode *node)
+gsk_text_node_get_color (GskRenderNode *node)
 {
   GskTextNode *self = (GskTextNode *) node;
 
@@ -4002,7 +4002,7 @@ gsk_text_node_peek_color (GskRenderNode *node)
 }
 
 /**
- * gsk_text_node_peek_font:
+ * gsk_text_node_get_font:
  * @node: (type GskTextNode): The #GskRenderNode
  *
  * Returns the font used by the text @node.
@@ -4010,7 +4010,7 @@ gsk_text_node_peek_color (GskRenderNode *node)
  * Returns: (transfer none): the font
  */
 PangoFont *
-gsk_text_node_peek_font (GskRenderNode *node)
+gsk_text_node_get_font (GskRenderNode *node)
 {
   GskTextNode *self = (GskTextNode *) node;
 
@@ -4056,7 +4056,7 @@ gsk_text_node_get_num_glyphs (GskRenderNode *node)
 }
 
 /**
- * gsk_text_node_peek_glyphs:
+ * gsk_text_node_get_glyphs:
  * @node: (type GskTextNode): a text #GskRenderNode
  * @n_glyphs: (out) (optional): the number of glyphs returned
  *
@@ -4065,8 +4065,8 @@ gsk_text_node_get_num_glyphs (GskRenderNode *node)
  * Returns: (transfer none) (array length=n_glyphs): the glyph information
  */
 const PangoGlyphInfo *
-gsk_text_node_peek_glyphs (GskRenderNode *node,
-                           guint         *n_glyphs)
+gsk_text_node_get_glyphs (GskRenderNode *node,
+                          guint         *n_glyphs)
 {
   GskTextNode *self = (GskTextNode *) node;
 
diff --git a/gsk/gskrendernodeparser.c b/gsk/gskrendernodeparser.c
index 2be0a55393..fd62b6d4c3 100644
--- a/gsk/gskrendernodeparser.c
+++ b/gsk/gskrendernodeparser.c
@@ -2274,7 +2274,7 @@ render_node_print (Printer       *p,
       {
         start_node (p, "color");
         append_rect_param (p, "bounds", &node->bounds);
-        append_rgba_param (p, "color", gsk_color_node_peek_color (node));
+        append_rgba_param (p, "color", gsk_color_node_get_color (node));
         end_node (p);
       }
       break;
@@ -2295,7 +2295,7 @@ render_node_print (Printer       *p,
     case GSK_LINEAR_GRADIENT_NODE:
       {
         const gsize n_stops = gsk_linear_gradient_node_get_n_color_stops (node);
-        const GskColorStop *stops = gsk_linear_gradient_node_peek_color_stops (node, NULL);
+        const GskColorStop *stops = gsk_linear_gradient_node_get_color_stops (node, NULL);
         gsize i;
 
         if (gsk_render_node_get_node_type (node) == GSK_REPEATING_LINEAR_GRADIENT_NODE)
@@ -2304,8 +2304,8 @@ render_node_print (Printer       *p,
           start_node (p, "linear-gradient");
 
         append_rect_param (p, "bounds", &node->bounds);
-        append_point_param (p, "end", gsk_linear_gradient_node_peek_end (node));
-        append_point_param (p, "start", gsk_linear_gradient_node_peek_start (node));
+        append_point_param (p, "end", gsk_linear_gradient_node_get_end (node));
+        append_point_param (p, "start", gsk_linear_gradient_node_get_start (node));
 
         _indent (p);
         g_string_append (p->str, "stops: ");
@@ -2328,7 +2328,7 @@ render_node_print (Printer       *p,
     case GSK_RADIAL_GRADIENT_NODE:
       {
         const gsize n_stops = gsk_radial_gradient_node_get_n_color_stops (node);
-        const GskColorStop *stops = gsk_radial_gradient_node_peek_color_stops (node, NULL);
+        const GskColorStop *stops = gsk_radial_gradient_node_get_color_stops (node, NULL);
         gsize i;
 
         if (gsk_render_node_get_node_type (node) == GSK_REPEATING_RADIAL_GRADIENT_NODE)
@@ -2337,7 +2337,7 @@ render_node_print (Printer       *p,
           start_node (p, "radial-gradient");
 
         append_rect_param (p, "bounds", &node->bounds);
-        append_point_param (p, "center", gsk_radial_gradient_node_peek_center (node));
+        append_point_param (p, "center", gsk_radial_gradient_node_get_center (node));
         append_float_param (p, "hradius", gsk_radial_gradient_node_get_hradius (node), 0.0f);
         append_float_param (p, "vradius", gsk_radial_gradient_node_get_vradius (node), 0.0f);
         append_float_param (p, "start", gsk_radial_gradient_node_get_start (node), 0.0f);
@@ -2373,7 +2373,7 @@ render_node_print (Printer       *p,
 
     case GSK_OUTSET_SHADOW_NODE:
       {
-        const GdkRGBA *color = gsk_outset_shadow_node_peek_color (node);
+        const GdkRGBA *color = gsk_outset_shadow_node_get_color (node);
 
         start_node (p, "outset-shadow");
 
@@ -2382,7 +2382,7 @@ render_node_print (Printer       *p,
           append_rgba_param (p, "color", color);
         append_float_param (p, "dx", gsk_outset_shadow_node_get_dx (node), 1.0f);
         append_float_param (p, "dy", gsk_outset_shadow_node_get_dy (node), 1.0f);
-        append_rounded_rect_param (p, "outline", gsk_outset_shadow_node_peek_outline (node));
+        append_rounded_rect_param (p, "outline", gsk_outset_shadow_node_get_outline (node));
         append_float_param (p, "spread", gsk_outset_shadow_node_get_spread (node), 0.0f);
 
         end_node (p);
@@ -2394,7 +2394,7 @@ render_node_print (Printer       *p,
         start_node (p, "clip");
 
         append_node_param (p, "child", gsk_clip_node_get_child (node));
-        append_rect_param (p, "clip", gsk_clip_node_peek_clip (node));
+        append_rect_param (p, "clip", gsk_clip_node_get_clip (node));
 
         end_node (p);
       }
@@ -2405,7 +2405,7 @@ render_node_print (Printer       *p,
         start_node (p, "rounded-clip");
 
         append_node_param (p, "child", gsk_rounded_clip_node_get_child (node));
-        append_rounded_rect_param (p, "clip", gsk_rounded_clip_node_peek_clip (node));
+        append_rounded_rect_param (p, "clip", gsk_rounded_clip_node_get_clip (node));
 
 
         end_node (p);
@@ -2430,10 +2430,10 @@ render_node_print (Printer       *p,
         start_node (p, "color-matrix");
 
         append_node_param (p, "child", gsk_color_matrix_node_get_child (node));
-        if (!graphene_matrix_is_identity (gsk_color_matrix_node_peek_color_matrix (node)))
-          append_matrix_param (p, "matrix", gsk_color_matrix_node_peek_color_matrix (node));
-        if (!graphene_vec4_equal (gsk_color_matrix_node_peek_color_offset (node), graphene_vec4_zero ()))
-          append_vec4_param (p, "offset", gsk_color_matrix_node_peek_color_offset (node));
+        if (!graphene_matrix_is_identity (gsk_color_matrix_node_get_color_matrix (node)))
+          append_matrix_param (p, "matrix", gsk_color_matrix_node_get_color_matrix (node));
+        if (!graphene_vec4_equal (gsk_color_matrix_node_get_color_offset (node), graphene_vec4_zero ()))
+          append_vec4_param (p, "offset", gsk_color_matrix_node_get_color_offset (node));
 
         end_node (p);
       }
@@ -2441,8 +2441,8 @@ render_node_print (Printer       *p,
 
     case GSK_BORDER_NODE:
       {
-        const GdkRGBA *colors = gsk_border_node_peek_colors (node);
-        const float *widths = gsk_border_node_peek_widths (node);
+        const GdkRGBA *colors = gsk_border_node_get_colors (node);
+        const float *widths = gsk_border_node_get_widths (node);
         guint i, n;
         start_node (p, "border");
 
@@ -2470,7 +2470,7 @@ render_node_print (Printer       *p,
             g_string_append (p->str, ";\n");
           }
 
-        append_rounded_rect_param (p, "outline", gsk_border_node_peek_outline (node));
+        append_rounded_rect_param (p, "outline", gsk_border_node_get_outline (node));
 
         if (widths[3] != widths[1])
           n = 4;
@@ -2513,7 +2513,7 @@ render_node_print (Printer       *p,
         g_string_append (p->str, "shadows: ");
         for (i = 0; i < n_shadows; i ++)
           {
-            const GskShadow *s = gsk_shadow_node_peek_shadow (node, i);
+            const GskShadow *s = gsk_shadow_node_get_shadow (node, i);
             char *color;
 
             if (i > 0)
@@ -2543,7 +2543,7 @@ render_node_print (Printer       *p,
 
     case GSK_INSET_SHADOW_NODE:
       {
-        const GdkRGBA *color = gsk_inset_shadow_node_peek_color (node);
+        const GdkRGBA *color = gsk_inset_shadow_node_get_color (node);
         start_node (p, "inset-shadow");
 
         append_float_param (p, "blur", gsk_inset_shadow_node_get_blur_radius (node), 0.0f);
@@ -2551,7 +2551,7 @@ render_node_print (Printer       *p,
           append_rgba_param (p, "color", color);
         append_float_param (p, "dx", gsk_inset_shadow_node_get_dx (node), 1.0f);
         append_float_param (p, "dy", gsk_inset_shadow_node_get_dy (node), 1.0f);
-        append_rounded_rect_param (p, "outline", gsk_inset_shadow_node_peek_outline (node));
+        append_rounded_rect_param (p, "outline", gsk_inset_shadow_node_get_outline (node));
         append_float_param (p, "spread", gsk_inset_shadow_node_get_spread (node), 0.0f);
 
         end_node (p);
@@ -2587,10 +2587,10 @@ render_node_print (Printer       *p,
     case GSK_TEXT_NODE:
       {
         const guint n_glyphs = gsk_text_node_get_num_glyphs (node);
-        const PangoGlyphInfo *glyphs = gsk_text_node_peek_glyphs (node, NULL);
+        const PangoGlyphInfo *glyphs = gsk_text_node_get_glyphs (node, NULL);
         const graphene_point_t *offset = gsk_text_node_get_offset (node);
-        const GdkRGBA *color = gsk_text_node_peek_color (node);
-        PangoFont *font = gsk_text_node_peek_font (node);
+        const GdkRGBA *color = gsk_text_node_get_color (node);
+        PangoFont *font = gsk_text_node_get_font (node);
         PangoFontDescription *desc;
         char *font_name;
         GString *str;
@@ -2825,7 +2825,7 @@ render_node_print (Printer       *p,
     case GSK_REPEAT_NODE:
       {
         GskRenderNode *child = gsk_repeat_node_get_child (node);
-        const graphene_rect_t *child_bounds = gsk_repeat_node_peek_child_bounds (node);
+        const graphene_rect_t *child_bounds = gsk_repeat_node_get_child_bounds (node);
 
         start_node (p, "repeat");
 
@@ -2872,7 +2872,7 @@ render_node_print (Printer       *p,
 
     case GSK_CAIRO_NODE:
       {
-        cairo_surface_t *surface = gsk_cairo_node_peek_surface (node);
+        cairo_surface_t *surface = gsk_cairo_node_get_surface (node);
         GByteArray *array;
 
         start_node (p, "cairo");
diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index d7489c42d5..103412487f 100644
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -337,7 +337,7 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass           *self,
       return;
 
     case GSK_CAIRO_NODE:
-      if (gsk_cairo_node_peek_surface (node) == NULL)
+      if (gsk_cairo_node_get_surface (node) == NULL)
         return;
       /* We're using recording surfaces, so drawing them to an image
        * surface and uploading them is the right thing.
@@ -347,8 +347,8 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass           *self,
 
     case GSK_TEXT_NODE:
       {
-        const PangoFont *font = gsk_text_node_peek_font (node);
-        const PangoGlyphInfo *glyphs = gsk_text_node_peek_glyphs (node, NULL);
+        const PangoFont *font = gsk_text_node_get_font (node);
+        const PangoGlyphInfo *glyphs = gsk_text_node_get_glyphs (node, NULL);
         guint num_glyphs = gsk_text_node_get_num_glyphs (node);
         gboolean has_color_glyphs = gsk_text_node_has_color_glyphs (node);
         int i;
@@ -571,7 +571,7 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass           *self,
 
     case GSK_CLIP_NODE:
       {
-        if (!gsk_vulkan_push_constants_intersect_rect (&op.constants.constants, constants, gsk_clip_node_peek_clip (node)))
+        if (!gsk_vulkan_push_constants_intersect_rect (&op.constants.constants, constants, gsk_clip_node_get_clip (node)))
           FALLBACK ("Failed to find intersection between clip of type %u and rectangle", constants->clip.type);
         if (op.constants.constants.clip.type == GSK_VULKAN_CLIP_ALL_CLIPPED)
           return;
@@ -590,7 +590,7 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass           *self,
       {
         if (!gsk_vulkan_push_constants_intersect_rounded (&op.constants.constants,
                                                           constants,
-                                                          gsk_rounded_clip_node_peek_clip (node)))
+                                                          gsk_rounded_clip_node_get_clip (node)))
           FALLBACK ("Failed to find intersection between clip of type %u and rounded rectangle", constants->clip.type);
         if (op.constants.constants.clip.type == GSK_VULKAN_CLIP_ALL_CLIPPED)
           return;
@@ -932,7 +932,7 @@ gsk_vulkan_render_pass_upload (GskVulkanRenderPass  *self,
           {
             GskRenderNode *child = gsk_repeat_node_get_child (op->render.node);
             const graphene_rect_t *bounds = &op->render.node->bounds;
-            const graphene_rect_t *child_bounds = gsk_repeat_node_peek_child_bounds (op->render.node);
+            const graphene_rect_t *child_bounds = gsk_repeat_node_get_child_bounds (op->render.node);
 
             op->render.source = gsk_vulkan_render_pass_get_node_as_texture (self,
                                                                             render,
@@ -1195,10 +1195,10 @@ gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
                                                           data + n_bytes + offset,
                                                           GSK_VULKAN_RENDERER (gsk_vulkan_render_get_renderer (render)),
                                                           &op->text.node->bounds,
-                                                          (PangoFont *)gsk_text_node_peek_font (op->text.node),
+                                                          (PangoFont *)gsk_text_node_get_font (op->text.node),
                                                           gsk_text_node_get_num_glyphs (op->text.node),
-                                                          gsk_text_node_peek_glyphs (op->text.node, NULL),
-                                                          gsk_text_node_peek_color (op->text.node),
+                                                          gsk_text_node_get_glyphs (op->text.node, NULL),
+                                                          gsk_text_node_get_color (op->text.node),
                                                           gsk_text_node_get_offset (op->text.node),
                                                           op->text.start_glyph,
                                                           op->text.num_glyphs,
@@ -1214,9 +1214,9 @@ gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
                                                                 data + n_bytes + offset,
                                                                 GSK_VULKAN_RENDERER (gsk_vulkan_render_get_renderer (render)),
                                                                 &op->text.node->bounds,
-                                                                (PangoFont *)gsk_text_node_peek_font (op->text.node),
+                                                                (PangoFont *)gsk_text_node_get_font (op->text.node),
                                                                 gsk_text_node_get_num_glyphs (op->text.node),
-                                                                gsk_text_node_peek_glyphs (op->text.node, NULL),
+                                                                gsk_text_node_get_glyphs (op->text.node, NULL),
                                                                 gsk_text_node_get_offset (op->text.node),
                                                                 op->text.start_glyph,
                                                                 op->text.num_glyphs,
@@ -1231,7 +1231,7 @@ gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
             gsk_vulkan_color_pipeline_collect_vertex_data (GSK_VULKAN_COLOR_PIPELINE (op->render.pipeline),
                                                            data + n_bytes + offset,
                                                            &op->render.node->bounds,
-                                                           gsk_color_node_peek_color (op->render.node));
+                                                           gsk_color_node_get_color (op->render.node));
             n_bytes += op->render.vertex_count;
           }
           break;
@@ -1242,11 +1242,11 @@ gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
             gsk_vulkan_linear_gradient_pipeline_collect_vertex_data (GSK_VULKAN_LINEAR_GRADIENT_PIPELINE (op->render.pipeline),
                                                                      data + n_bytes + offset,
                                                                      &op->render.node->bounds,
-                                                                     gsk_linear_gradient_node_peek_start (op->render.node),
-                                                                     gsk_linear_gradient_node_peek_end (op->render.node),
+                                                                     gsk_linear_gradient_node_get_start (op->render.node),
+                                                                     gsk_linear_gradient_node_get_end (op->render.node),
                                                                      gsk_render_node_get_node_type (op->render.node) == GSK_REPEATING_LINEAR_GRADIENT_NODE,
                                                                      gsk_linear_gradient_node_get_n_color_stops (op->render.node),
-                                                                     gsk_linear_gradient_node_peek_color_stops (op->render.node, NULL));
+                                                                     gsk_linear_gradient_node_get_color_stops (op->render.node, NULL));
             n_bytes += op->render.vertex_count;
           }
           break;
@@ -1295,8 +1295,8 @@ gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
                                                             data + n_bytes + offset,
                                                             &op->render.node->bounds,
                                                             &op->render.source_rect,
-                                                            gsk_color_matrix_node_peek_color_matrix (op->render.node),
-                                                            gsk_color_matrix_node_peek_color_offset (op->render.node));
+                                                            gsk_color_matrix_node_get_color_matrix (op->render.node),
+                                                            gsk_color_matrix_node_get_color_offset (op->render.node));
             n_bytes += op->render.vertex_count;
           }
           break;
@@ -1306,9 +1306,9 @@ gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
             op->render.vertex_offset = offset + n_bytes;
             gsk_vulkan_border_pipeline_collect_vertex_data (GSK_VULKAN_BORDER_PIPELINE (op->render.pipeline),
                                                             data + n_bytes + offset,
-                                                            gsk_border_node_peek_outline (op->render.node),
-                                                            gsk_border_node_peek_widths (op->render.node),
-                                                            gsk_border_node_peek_colors (op->render.node));
+                                                            gsk_border_node_get_outline (op->render.node),
+                                                            gsk_border_node_get_widths (op->render.node),
+                                                            gsk_border_node_get_colors (op->render.node));
             n_bytes += op->render.vertex_count;
           }
           break;
@@ -1318,8 +1318,8 @@ gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
             op->render.vertex_offset = offset + n_bytes;
             gsk_vulkan_box_shadow_pipeline_collect_vertex_data (GSK_VULKAN_BOX_SHADOW_PIPELINE (op->render.pipeline),
                                                                 data + n_bytes + offset,
-                                                                gsk_inset_shadow_node_peek_outline (op->render.node),
-                                                                gsk_inset_shadow_node_peek_color (op->render.node),
+                                                                gsk_inset_shadow_node_get_outline (op->render.node),
+                                                                gsk_inset_shadow_node_get_color (op->render.node),
                                                                 gsk_inset_shadow_node_get_dx (op->render.node),
                                                                 gsk_inset_shadow_node_get_dy (op->render.node),
                                                                 gsk_inset_shadow_node_get_spread (op->render.node),
@@ -1333,8 +1333,8 @@ gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
             op->render.vertex_offset = offset + n_bytes;
             gsk_vulkan_box_shadow_pipeline_collect_vertex_data (GSK_VULKAN_BOX_SHADOW_PIPELINE (op->render.pipeline),
                                                                 data + n_bytes + offset,
-                                                                gsk_outset_shadow_node_peek_outline (op->render.node),
-                                                                gsk_outset_shadow_node_peek_color (op->render.node),
+                                                                gsk_outset_shadow_node_get_outline (op->render.node),
+                                                                gsk_outset_shadow_node_get_color (op->render.node),
                                                                 gsk_outset_shadow_node_get_dx (op->render.node),
                                                                 gsk_outset_shadow_node_get_dy (op->render.node),
                                                                 gsk_outset_shadow_node_get_spread (op->render.node),