Skip to content

Commit

Permalink
Pass borrowed child stylesheet to Gecko for loading rather than the i…
Browse files Browse the repository at this point in the history
…mport rule.
  • Loading branch information
upsuper committed Apr 3, 2017
1 parent fac0d17 commit 975043d
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions ports/geckolib/stylesheet_loader.rs
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
}
}

0 comments on commit 975043d

Please sign in to comment.