[librsvg] Call rsvg_cairo_get_surface_of_node(); remove it from the vtable

[Federico Mena Quintero <federico src gnome org>]

commit 754327efbf879366b1ca13c0a36cbd352cf0b1de
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Mar 28 19:15:59 2018 -0600

    Call rsvg_cairo_get_surface_of_node(); remove it from the vtable
    
    There's a single caller, anyway.

 librsvg/rsvg-base.c         | 6 ------
 librsvg/rsvg-cairo-clip.c   | 1 -
 librsvg/rsvg-cairo-render.c | 1 -
 librsvg/rsvg-filter.c       | 3 ++-
 librsvg/rsvg-private.h      | 4 ----
 5 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/librsvg/rsvg-base.c b/librsvg/rsvg-base.c
index e2bee7d0..962cb172 100644
--- a/librsvg/rsvg-base.c
+++ b/librsvg/rsvg-base.c
@@ -558,12 +558,6 @@ rsvg_get_end_marker (RsvgDrawingCtx *ctx)
     return state->endMarker;
 }
 
-cairo_surface_t *
-rsvg_get_surface_of_node (RsvgDrawingCtx * ctx, RsvgNode * drawable, double w, double h)
-{
-    return ctx->render->get_surface_of_node (ctx, drawable, w, h);
-}
-
 void
 rsvg_drawing_ctx_insert_bbox (RsvgDrawingCtx *draw_ctx, RsvgBbox *bbox)
 {
diff --git a/librsvg/rsvg-cairo-clip.c b/librsvg/rsvg-cairo-clip.c
index 2e841230..1f9c4e8b 100644
--- a/librsvg/rsvg-cairo-clip.c
+++ b/librsvg/rsvg-cairo-clip.c
@@ -69,7 +69,6 @@ rsvg_cairo_clip_render_new (cairo_t *cr, RsvgCairoRender *parent)
     render->type = RSVG_RENDER_TYPE_CAIRO_CLIP;
     render->free = rsvg_cairo_clip_render_free;
     render->set_affine_on_cr = rsvg_cairo_set_affine_on_cr;
-    render->get_surface_of_node = NULL;
 
     cairo_render->initial_cr = parent->initial_cr;
     cairo_render->cr         = cr;
diff --git a/librsvg/rsvg-cairo-render.c b/librsvg/rsvg-cairo-render.c
index d4326aca..24ebe26d 100644
--- a/librsvg/rsvg-cairo-render.c
+++ b/librsvg/rsvg-cairo-render.c
@@ -74,7 +74,6 @@ rsvg_cairo_render_new (cairo_t * cr, double width, double height)
     cairo_render->super.type = RSVG_RENDER_TYPE_CAIRO;
     cairo_render->super.free = rsvg_cairo_render_free;
     cairo_render->super.set_affine_on_cr = rsvg_cairo_set_affine_on_cr;
-    cairo_render->super.get_surface_of_node = rsvg_cairo_get_surface_of_node;
     cairo_render->width = width;
     cairo_render->height = height;
     cairo_render->offset_x = 0;
diff --git a/librsvg/rsvg-filter.c b/librsvg/rsvg-filter.c
index 4a647a78..60fc376d 100644
--- a/librsvg/rsvg-filter.c
+++ b/librsvg/rsvg-filter.c
@@ -29,6 +29,7 @@
 #include "rsvg-filter.h"
 #include "rsvg-styles.h"
 #include "rsvg-css.h"
+#include "rsvg-cairo-draw.h"
 #include "rsvg-cairo-render.h"
 
 #include <string.h>
@@ -4257,7 +4258,7 @@ rsvg_filter_primitive_image_render_in (RsvgFilterPrimitiveImage *image, RsvgFilt
 
     rsvg_drawing_ctx_set_current_state_affine (ctx, &context->paffine);
 
-    result = rsvg_get_surface_of_node (ctx, drawable, context->width, context->height);
+    result = rsvg_cairo_get_surface_of_node (ctx, drawable, context->width, context->height);
 
     rsvg_drawing_ctx_release_node (ctx, drawable);
 
diff --git a/librsvg/rsvg-private.h b/librsvg/rsvg-private.h
index 091660bc..36bcc517 100644
--- a/librsvg/rsvg-private.h
+++ b/librsvg/rsvg-private.h
@@ -207,8 +207,6 @@ struct RsvgRender {
     void (*free) (RsvgRender * self);
 
     void             (*set_affine_on_cr)        (RsvgDrawingCtx *ctx, cairo_t *cr, cairo_matrix_t *affine);
-    cairo_surface_t *(*get_surface_of_node)     (RsvgDrawingCtx *ctx, RsvgNode * drawable,
-                                                 double w, double h);
     void             (*insert_bbox)             (RsvgDrawingCtx *ctx, RsvgBbox *bbox);
 };
 
@@ -479,8 +477,6 @@ G_GNUC_INTERNAL
 cairo_surface_t *rsvg_cairo_surface_from_pixbuf (const GdkPixbuf *pixbuf);
 G_GNUC_INTERNAL
 GdkPixbuf *rsvg_cairo_surface_to_pixbuf (cairo_surface_t *surface);
-G_GNUC_INTERNAL
-cairo_surface_t *rsvg_get_surface_of_node (RsvgDrawingCtx * ctx, RsvgNode * drawable, double w, double h);
 
 G_GNUC_INTERNAL
 void rsvg_drawing_ctx_insert_bbox (RsvgDrawingCtx *draw_ctx, RsvgBbox *bbox);