aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/stylesheet_loader.rs
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2017-04-10 11:17:51 +0800
committerEmilio Cobos Álvarez <emilio@crisal.io>2017-04-12 21:24:51 +0800
commit299922243617dc5e15a092b2ea6fd7d6b090dcef (patch)
tree5e6e8f215520fe80041ea32e02e2258080bf535a /components/script/stylesheet_loader.rs
parentfbd4049e466eb51e6c830927daa7539386f7811b (diff)
downloadservo-299922243617dc5e15a092b2ea6fd7d6b090dcef.tar.gz
servo-299922243617dc5e15a092b2ea6fd7d6b090dcef.zip
Bug 1325878: Don't use nsMediaList for loading imports. r=xidorn
MozReview-Commit-ID: HR23bqZcmcA Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
Diffstat (limited to 'components/script/stylesheet_loader.rs')
-rw-r--r--components/script/stylesheet_loader.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs
index cdafde510c9..961d487a330 100644
--- a/components/script/stylesheet_loader.rs
+++ b/components/script/stylesheet_loader.rs
@@ -271,15 +271,15 @@ impl<'a> StylesheetLoader<'a> {
impl<'a> StyleStylesheetLoader for StylesheetLoader<'a> {
fn request_stylesheet(
&self,
- media: MediaList,
- make_import: &mut FnMut(MediaList) -> ImportRule,
+ media: Arc<Locked<MediaList>>,
+ make_import: &mut FnMut(Arc<Locked<MediaList>>) -> ImportRule,
make_arc: &mut FnMut(ImportRule) -> Arc<StyleLocked<ImportRule>>,
) -> Arc<StyleLocked<ImportRule>> {
let import = make_import(media);
let url = import.url.url().expect("Invalid urls shouldn't enter the loader").clone();
- //TODO (mrnayak) : Whether we should use the original loader's CORS setting?
- //Fix this when spec has more details.
+ // TODO (mrnayak) : Whether we should use the original loader's CORS
+ // setting? Fix this when spec has more details.
let source = StylesheetContextSource::Import(import.stylesheet.clone());
self.load(source, url, None, "".to_owned());