[librsvg] handle::load_css() - Take a &mut CssStyles, don't extract it from the handle



commit 6371d42060f29e6a1666e0fbd017f0ad501a0f4c
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Nov 27 08:07:58 2018 -0600

    handle::load_css() - Take a &mut CssStyles, don't extract it from the handle

 rsvg_internals/src/css.rs    | 2 +-
 rsvg_internals/src/handle.rs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/rsvg_internals/src/css.rs b/rsvg_internals/src/css.rs
index 2e777063..b180580c 100644
--- a/rsvg_internals/src/css.rs
+++ b/rsvg_internals/src/css.rs
@@ -153,7 +153,7 @@ unsafe extern "C" fn css_import_style(
     let raw_uri = cr_string_peek_raw_str(a_uri);
     let uri = utf8_cstr(raw_uri);
 
-    handle::load_css(handler_data.handle, uri);
+    handle::load_css(handler_data.css_styles, handler_data.handle, uri);
 }
 
 unsafe extern "C" fn css_start_selector(
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 1d4dc81e..a5ce8738 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -194,7 +194,7 @@ pub fn load_xml_xinclude(handle: *mut RsvgHandle, href: &str) -> bool {
     unsafe { from_glib(rsvg_load_handle_xml_xinclude(handle, href.to_glib_none().0)) }
 }
 
-pub fn load_css(handle: *mut RsvgHandle, href: &str) {
+pub fn load_css(css_styles: &mut CssStyles, handle: *mut RsvgHandle, href: &str) {
     if let Ok(data) = acquire_data(handle, href) {
         let BinaryData {
             data: bytes,
@@ -208,7 +208,6 @@ pub fn load_css(handle: *mut RsvgHandle, href: &str) {
         }
 
         if let Ok(utf8) = String::from_utf8(bytes) {
-            let css_styles = get_css_styles_mut(handle);
             css::parse_into_css_styles(css_styles, handle, &utf8);
         } else {
             rsvg_log!(
@@ -232,7 +231,7 @@ pub unsafe extern "C" fn rsvg_handle_load_css(handle: *mut RsvgHandle, href: *co
     assert!(!href.is_null());
 
     let href = utf8_cstr(href);
-    load_css(handle, href);
+    load_css(get_css_styles_mut(handle), handle, href);
 }
 
 #[no_mangle]


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