[librsvg] rsvg_drawing_ctx_new(): Don't pass the defs; the DrawingCtx can get them from the handle

[Federico Mena Quintero <federico src gnome org>]

commit b9b973b408eef9f565adbc7a782a88f6155e0b1d
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Nov 30 18:19:05 2018 -0600

    rsvg_drawing_ctx_new(): Don't pass the defs; the DrawingCtx can get them from the handle

 librsvg/rsvg-handle.c             |  1 -
 librsvg/rsvg-private.h            |  1 -
 rsvg_internals/src/drawing_ctx.rs | 14 ++++----------
 3 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/librsvg/rsvg-handle.c b/librsvg/rsvg-handle.c
index 13eb6b1a..9ae4d1a2 100644
--- a/librsvg/rsvg-handle.c
+++ b/librsvg/rsvg-handle.c
@@ -1076,7 +1076,6 @@ rsvg_handle_create_drawing_ctx(RsvgHandle *handle,
                                  dimensions->width, dimensions->height,
                                  dimensions->em, dimensions->ex,
                                  handle->priv->dpi_x, handle->priv->dpi_y,
-                                 handle->priv->defs,
                                  handle->priv->is_testing);
 }
 
diff --git a/librsvg/rsvg-private.h b/librsvg/rsvg-private.h
index 86151113..a353b602 100644
--- a/librsvg/rsvg-private.h
+++ b/librsvg/rsvg-private.h
@@ -205,7 +205,6 @@ RsvgDrawingCtx *rsvg_drawing_ctx_new (RsvgHandle *handle,
                                       double vb_height,
                                       double dpi_x,
                                       double dpi_y,
-                                      RsvgDefs *defs,
                                       gboolean testing);
 
 /* Defined in rsvg_internals/src/drawing_ctx.rs */
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 057f7249..f7594249 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -13,11 +13,11 @@ use std::rc::{Rc, Weak};
 use bbox::BoundingBox;
 use clip_path::{ClipPathUnits, NodeClipPath};
 use coord_units::CoordUnits;
-use defs::{Defs, Fragment, RsvgDefs};
+use defs::{Defs, Fragment};
 use error::RenderingError;
 use filters;
 use float_eq_cairo::ApproxEqCairo;
-use handle::RsvgHandle;
+use handle::{self, RsvgHandle};
 use length::Dasharray;
 use mask::NodeMask;
 use node::{CascadedValues, NodeType, RsvgNode};
@@ -146,9 +146,8 @@ impl<'a> DrawingCtx<'a> {
         vb_height: f64,
         dpi_x: f64,
         dpi_y: f64,
-        defs: &mut Defs,
         is_testing: bool,
-    ) -> DrawingCtx<'_> {
+    ) -> DrawingCtx<'a> {
         let mut affine = cr.get_matrix();
         let rect = cairo::Rectangle {
             x: 0.0,
@@ -187,7 +186,7 @@ impl<'a> DrawingCtx<'a> {
             bbox: BoundingBox::new(&affine),
             bbox_stack: Vec::new(),
             drawsub_stack: Vec::new(),
-            defs: RefCell::new(defs),
+            defs: RefCell::new(handle::get_defs(handle)),
             acquired_nodes: Rc::new(RefCell::new(Vec::new())),
             is_testing,
         }
@@ -1196,12 +1195,8 @@ pub extern "C" fn rsvg_drawing_ctx_new(
     vb_height: libc::c_double,
     dpi_x: libc::c_double,
     dpi_y: libc::c_double,
-    defs: *mut RsvgDefs,
     is_testing: glib_sys::gboolean,
 ) -> *mut RsvgDrawingCtx {
-    assert!(!defs.is_null());
-    let defs = unsafe { &mut *(defs as *mut Defs) };
-
     Box::into_raw(Box::new(DrawingCtx::new(
         handle,
         unsafe { from_glib_none(cr) },
@@ -1211,7 +1206,6 @@ pub extern "C" fn rsvg_drawing_ctx_new(
         vb_height,
         dpi_x,
         dpi_y,
-        defs,
         from_glib(is_testing),
     ))) as *mut RsvgDrawingCtx
 }