[librsvg] Handle.close() - Use Svg::load_from_stream instead of lower-level functions

[Federico Mena Quintero <federico src gnome org>]

commit 27721be06ef2cd3f5a50340c125ac4fd89803d0b
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Mar 5 17:10:18 2019 -0600

    Handle.close() - Use Svg::load_from_stream instead of lower-level functions

 rsvg_internals/src/handle.rs | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 22b27a72..1ac37cb7 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -23,8 +23,6 @@ use surface_utils::{shared_surface::SharedImageSurface, shared_surface::SurfaceT
 use svg::Svg;
 use url::Url;
 use util::rsvg_g_warning;
-use xml::XmlState;
-use xml2_load::xml_state_load_from_possibly_compressed_stream;
 
 /// Flags used during loading
 ///
@@ -276,23 +274,12 @@ impl Handle {
                 let buffer = self.buffer.borrow();
                 let bytes = Bytes::from(&*buffer);
                 let stream = gio::MemoryInputStream::new_from_bytes(&bytes);
-                let mut xml = XmlState::new(&self.load_options());
-
-                xml_state_load_from_possibly_compressed_stream(
-                    &mut xml,
-                    self.load_flags.get(),
-                    &stream.upcast(),
-                    None,
-                )
-                .map_err(|e| {
-                    self.load_state.set(LoadState::ClosedError);
-                    e
-                })?;
 
-                let svg = xml.steal_result().map_err(|e| {
-                    self.load_state.set(LoadState::ClosedError);
-                    e
-                })?;
+                let svg = Svg::load_from_stream(&self.load_options(), &stream.upcast(), None)
+                    .map_err(|e| {
+                        self.load_state.set(LoadState::ClosedError);
+                        e
+                    })?;
 
                 self.load_state.set(LoadState::ClosedOk);
                 *self.svg.borrow_mut() = Some(Rc::new(svg));