From 975043d0cec44510c740f49f2bdb2455ddf090b4 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Mon, 3 Apr 2017 21:17:08 +1000 Subject: [PATCH] Pass borrowed child stylesheet to Gecko for loading rather than the import rule. --- ports/geckolib/stylesheet_loader.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/geckolib/stylesheet_loader.rs b/ports/geckolib/stylesheet_loader.rs index 78a859cc64e..598d778cbdb 100644 --- a/ports/geckolib/stylesheet_loader.rs +++ b/ports/geckolib/stylesheet_loader.rs @@ -8,7 +8,7 @@ use style::gecko_bindings::structs::{Loader, ServoStyleSheet}; use style::gecko_bindings::sugar::ownership::HasArcFFI; use style::media_queries::MediaList; use style::shared_lock::Locked; -use style::stylesheets::{ImportRule, StylesheetLoader as StyleStylesheetLoader}; +use style::stylesheets::{ImportRule, Stylesheet, StylesheetLoader as StyleStylesheetLoader}; use style_traits::ToCss; pub struct StylesheetLoader(*mut Loader, *mut ServoStyleSheet); @@ -45,17 +45,16 @@ impl StyleStylesheetLoader for StylesheetLoader { let (spec_bytes, spec_len): (*const u8, usize) = import.url.as_slice_components(); let base_url_data = import.url.extra_data.get(); - let arc = make_arc(import); unsafe { Gecko_LoadStyleSheet(self.0, self.1, - HasArcFFI::arc_as_borrowed(&arc), + Stylesheet::arc_as_borrowed(&import.stylesheet), base_url_data, spec_bytes, spec_len as u32, media_string.as_bytes().as_ptr(), media_string.len() as u32); } - arc + make_arc(import) } }