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

Deindent the main part of handle_stylesheet_url.

Browse source
This commit is contained in:
Ms2ger 2016-09-27 17:22:47 +02:00
parent 7fe688b8e9
commit ebbf9fd4d5
1 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

86
components/script/dom/htmllinkelement.rs
View file

@ -203,56 +203,56 @@ impl HTMLLinkElement {
return; return;
} }
match document.base_url().join(href) { let url = match document.base_url().join(href) {
Ok(url) => { Err(e) => return debug!("Parsing url {} failed: {}", href, e),
let element = self.upcast::<Element>(); Ok(url) => url,
};
let mq_attribute = element.get_attribute(&ns!(), &atom!("media")); let element = self.upcast::<Element>();
let value = mq_attribute.r().map(|a| a.value());
let mq_str = match value {
Some(ref value) => &***value,
None => "",
};
let mut css_parser = CssParser::new(&mq_str);
let media = parse_media_query_list(&mut css_parser);
// TODO: #8085 - Don't load external stylesheets if the node's mq doesn't match. let mq_attribute = element.get_attribute(&ns!(), &atom!("media"));
let elem = Trusted::new(self); let value = mq_attribute.r().map(|a| a.value());
let mq_str = match value {
Some(ref value) => &***value,
None => "",
};
let mut css_parser = CssParser::new(&mq_str);
let media = parse_media_query_list(&mut css_parser);
let context = Arc::new(Mutex::new(StylesheetContext { // TODO: #8085 - Don't load external stylesheets if the node's mq doesn't match.
elem: elem, let elem = Trusted::new(self);
media: Some(media),
data: vec!(),
metadata: None,
url: url.clone(),
}));
let (action_sender, action_receiver) = ipc::channel().unwrap(); let context = Arc::new(Mutex::new(StylesheetContext {
let listener = NetworkListener { elem: elem,
context: context, media: Some(media),
script_chan: document.window().networking_task_source(), data: vec!(),
wrapper: Some(document.window().get_runnable_wrapper()), metadata: None,
}; url: url.clone(),
let response_target = AsyncResponseTarget { }));
sender: action_sender,
};
ROUTER.add_route(action_receiver.to_opaque(), box move |message| {
listener.notify_action(message.to().unwrap());
});
if self.parser_inserted.get() { let (action_sender, action_receiver) = ipc::channel().unwrap();
document.increment_script_blocking_stylesheet_count(); let listener = NetworkListener {
} context: context,
script_chan: document.window().networking_task_source(),
wrapper: Some(document.window().get_runnable_wrapper()),
};
let response_target = AsyncResponseTarget {
sender: action_sender,
};
ROUTER.add_route(action_receiver.to_opaque(), box move |message| {
listener.notify_action(message.to().unwrap());
});
let referrer_policy = match self.RelList().Contains("noreferrer".into()) { if self.parser_inserted.get() {
true => Some(ReferrerPolicy::NoReferrer), document.increment_script_blocking_stylesheet_count();
false => None,
};
document.load_async(LoadType::Stylesheet(url), response_target, referrer_policy);
}
Err(e) => debug!("Parsing url {} failed: {}", href, e)
} }
let referrer_policy = match self.RelList().Contains("noreferrer".into()) {
true => Some(ReferrerPolicy::NoReferrer),
false => None,
};
document.load_async(LoadType::Stylesheet(url), response_target, referrer_policy);
} }
fn handle_favicon_url(&self, rel: &str, href: &str, sizes: &Option<String>) { fn handle_favicon_url(&self, rel: &str, href: &str, sizes: &Option<String>) {