[librsvg] Inline rsvg_cairo_insert_bbox() into the toplevel rsvg_drawing_ctx_insert_bbox()



commit 777d49eb2c2c6586fc7cc9856751e4f12c0c6b6c
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Mar 28 12:49:20 2018 -0600

    Inline rsvg_cairo_insert_bbox() into the toplevel rsvg_drawing_ctx_insert_bbox()
    
    Both RsvgCairoRender and RsvgCairoClip used the same implementation, anyway

 librsvg/rsvg-base.c         | 4 +++-
 librsvg/rsvg-cairo-clip.c   | 1 -
 librsvg/rsvg-cairo-draw.c   | 8 --------
 librsvg/rsvg-cairo-draw.h   | 3 ---
 librsvg/rsvg-cairo-render.c | 1 -
 5 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/librsvg/rsvg-base.c b/librsvg/rsvg-base.c
index 54075153..30df80ea 100644
--- a/librsvg/rsvg-base.c
+++ b/librsvg/rsvg-base.c
@@ -573,7 +573,9 @@ rsvg_get_surface_of_node (RsvgDrawingCtx * ctx, RsvgNode * drawable, double w, d
 void
 rsvg_drawing_ctx_insert_bbox (RsvgDrawingCtx *draw_ctx, RsvgBbox *bbox)
 {
-    draw_ctx->render->insert_bbox (draw_ctx, bbox);
+    RsvgCairoRender *render = RSVG_CAIRO_RENDER (draw_ctx->render);
+
+    rsvg_bbox_insert (&render->bbox, bbox);
 }
 
 cairo_surface_t *
diff --git a/librsvg/rsvg-cairo-clip.c b/librsvg/rsvg-cairo-clip.c
index e717a201..4e7ed54d 100644
--- a/librsvg/rsvg-cairo-clip.c
+++ b/librsvg/rsvg-cairo-clip.c
@@ -76,7 +76,6 @@ rsvg_cairo_clip_render_new (cairo_t *cr, RsvgCairoRender *parent)
     render->set_affine_on_cr = rsvg_cairo_set_affine_on_cr;
     render->add_clipping_rect = rsvg_cairo_clip_add_clipping_rect;
     render->get_surface_of_node = NULL;
-    render->insert_bbox = rsvg_cairo_insert_bbox;
 
     cairo_render->initial_cr = parent->initial_cr;
     cairo_render->cr         = cr;
diff --git a/librsvg/rsvg-cairo-draw.c b/librsvg/rsvg-cairo-draw.c
index ce2351e3..eb441a2b 100644
--- a/librsvg/rsvg-cairo-draw.c
+++ b/librsvg/rsvg-cairo-draw.c
@@ -564,14 +564,6 @@ rsvg_cairo_get_surface_of_node (RsvgDrawingCtx *ctx,
     return surface;
 }
 
-void
-rsvg_cairo_insert_bbox (RsvgDrawingCtx *draw_ctx, RsvgBbox *bbox)
-{
-    RsvgCairoRender *render = RSVG_CAIRO_RENDER (draw_ctx->render);
-
-    rsvg_bbox_insert (&render->bbox, bbox);
-}
-
 cairo_surface_t *
 rsvg_cairo_surface_from_pixbuf (const GdkPixbuf *pixbuf)
 {
diff --git a/librsvg/rsvg-cairo-draw.h b/librsvg/rsvg-cairo-draw.h
index bf65dc74..99487306 100644
--- a/librsvg/rsvg-cairo-draw.h
+++ b/librsvg/rsvg-cairo-draw.h
@@ -54,9 +54,6 @@ G_GNUC_INTERNAL
 cairo_surface_t*rsvg_cairo_get_surface_of_node  (RsvgDrawingCtx *ctx, RsvgNode *drawable, 
                                                  double width, double height);
 
-G_GNUC_INTERNAL
-void rsvg_cairo_insert_bbox (RsvgDrawingCtx *draw_ctx, RsvgBbox *bbox);
-
 G_END_DECLS
 
 #endif /*RSVG_CAIRO_DRAW_H */
diff --git a/librsvg/rsvg-cairo-render.c b/librsvg/rsvg-cairo-render.c
index 21ce307b..b3454bf0 100644
--- a/librsvg/rsvg-cairo-render.c
+++ b/librsvg/rsvg-cairo-render.c
@@ -76,7 +76,6 @@ rsvg_cairo_render_new (cairo_t * cr, double width, double height)
     cairo_render->super.set_affine_on_cr = rsvg_cairo_set_affine_on_cr;
     cairo_render->super.add_clipping_rect = rsvg_cairo_add_clipping_rect;
     cairo_render->super.get_surface_of_node = rsvg_cairo_get_surface_of_node;
-    cairo_render->super.insert_bbox = rsvg_cairo_insert_bbox;
     cairo_render->width = width;
     cairo_render->height = height;
     cairo_render->offset_x = 0;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]