[librsvg: 7/18] css_import_style(): Use handle::load_css() instead of duplicating that code



commit 27a032f0a9d125e8c550863f9578f64a5cc3d485
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Nov 23 08:54:44 2018 -0600

    css_import_style(): Use handle::load_css() instead of duplicating that code

 rsvg_internals/src/css.rs    | 9 +--------
 rsvg_internals/src/handle.rs | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/rsvg_internals/src/css.rs b/rsvg_internals/src/css.rs
index 4f56e668..76566fa8 100644
--- a/rsvg_internals/src/css.rs
+++ b/rsvg_internals/src/css.rs
@@ -145,14 +145,7 @@ unsafe extern "C" fn css_import_style(
     let raw_uri = cr_string_peek_raw_str(a_uri);
     let uri = utf8_cstr(raw_uri);
 
-    if let Ok(binary_data) = handle::acquire_data(handler_data.handle, uri) {
-        if binary_data.content_type.as_ref().map(String::as_ref) == Some("text/css") {
-            parse_into_handle(
-                handler_data.handle,
-                str::from_utf8_unchecked(&binary_data.data),
-            );
-        }
-    }
+    handle::load_css(handler_data.handle, uri);
 }
 
 unsafe fn get_doc_handler_data<'a>(doc_handler: *mut CRDocHandler) -> &'a mut DocHandlerData {
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 73fedc59..5f62755a 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -196,7 +196,7 @@ pub fn load_xml_xinclude(handle: *mut RsvgHandle, url: &str) -> bool {
     unsafe { from_glib(rsvg_load_handle_xml_xinclude(handle, url.to_glib_none().0)) }
 }
 
-fn load_css(handle: *mut RsvgHandle, href: &str) {
+pub fn load_css(handle: *mut RsvgHandle, href: &str) {
     if let Ok(data) = acquire_data(handle, href) {
         let BinaryData {
             data: bytes,


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