Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove some indirection.

Browse source
This commit is contained in:
Simon Sapin 2017-03-18 14:00:01 +01:00
parent 1e38013783
commit cc046300f0
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/script/stylesheet_loader.rs
View file

@ -55,7 +55,7 @@ pub trait StylesheetOwner {
pub enum StylesheetContextSource { pub enum StylesheetContextSource {
// NB: `media` is just an option so we avoid cloning it. // NB: `media` is just an option so we avoid cloning it.
LinkElement { media: Option<MediaList>, }, LinkElement { media: Option<MediaList>, },
Import(Arc<StyleLocked<ImportRule>>), Import(Arc<Stylesheet>),
} }
/// The context required for asynchronously loading an external stylesheet. /// The context required for asynchronously loading an external stylesheet.
@ -158,16 +158,9 @@ impl FetchResponseListener for StylesheetContext {
win.layout_chan().send(Msg::AddStylesheet(sheet)).unwrap(); win.layout_chan().send(Msg::AddStylesheet(sheet)).unwrap();
} }
} }
StylesheetContextSource::Import(ref import) => { StylesheetContextSource::Import(ref stylesheet) => {
let mut guard = document.style_shared_lock().write(); let mut guard = document.style_shared_lock().write();
// Clone an Arc because we can’t borrow `guard` twice at the same time.
// FIXME(SimonSapin): allow access to multiple objects with one write guard?
// Would need a set of usize pointer addresses or something,
// the same object is not accessed more than once.
let stylesheet = Arc::clone(&import.write_with(&mut guard).stylesheet);
Stylesheet::update_from_bytes(&stylesheet, Stylesheet::update_from_bytes(&stylesheet,
&data, &data,
protocol_encoding_label, protocol_encoding_label,
@ -289,12 +282,12 @@ impl<'a> StyleStylesheetLoader for StylesheetLoader<'a> {
) -> Arc<StyleLocked<ImportRule>> { ) -> Arc<StyleLocked<ImportRule>> {
let import = make_import(media); let import = make_import(media);
let url = import.url.url().expect("Invalid urls shouldn't enter the loader").clone(); let url = import.url.url().expect("Invalid urls shouldn't enter the loader").clone();
let arc = make_arc(import);
//TODO (mrnayak) : Whether we should use the original loader's CORS setting? //TODO (mrnayak) : Whether we should use the original loader's CORS setting?
//Fix this when spec has more details. //Fix this when spec has more details.
self.load(StylesheetContextSource::Import(arc.clone()), url, None, "".to_owned()); let source = StylesheetContextSource::Import(import.stylesheet.clone());
self.load(source, url, None, "".to_owned());
arc make_arc(import)
} }
} }