diff options
author | Ms2ger <Ms2ger@gmail.com> | 2016-09-27 17:22:47 +0200 |
---|---|---|
committer | Ms2ger <Ms2ger@gmail.com> | 2016-09-30 10:58:45 +0200 |
commit | ebbf9fd4d5119481bc9d6b43bd7fa1c8137b0bc1 (patch) | |
tree | 2e8cc597f65d1c49fc10c658723d1c9fb6d78c16 /components/script/dom/htmllinkelement.rs | |
parent | 7fe688b8e932d60c1b588b1dd80e939d80be2706 (diff) | |
download | servo-ebbf9fd4d5119481bc9d6b43bd7fa1c8137b0bc1.tar.gz servo-ebbf9fd4d5119481bc9d6b43bd7fa1c8137b0bc1.zip |
Deindent the main part of handle_stylesheet_url.
Diffstat (limited to 'components/script/dom/htmllinkelement.rs')
-rw-r--r-- | components/script/dom/htmllinkelement.rs | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 773f1630489..a3677e8be94 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -203,56 +203,56 @@ impl HTMLLinkElement { return; } - match document.base_url().join(href) { - Ok(url) => { - let element = self.upcast::<Element>(); - - let mq_attribute = element.get_attribute(&ns!(), &atom!("media")); - 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 elem = Trusted::new(self); - - let context = Arc::new(Mutex::new(StylesheetContext { - elem: elem, - media: Some(media), - data: vec!(), - metadata: None, - url: url.clone(), - })); - - let (action_sender, action_receiver) = ipc::channel().unwrap(); - 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()); - }); - - if self.parser_inserted.get() { - document.increment_script_blocking_stylesheet_count(); - } + let url = match document.base_url().join(href) { + Err(e) => return debug!("Parsing url {} failed: {}", href, e), + Ok(url) => url, + }; + + let element = self.upcast::<Element>(); + + let mq_attribute = element.get_attribute(&ns!(), &atom!("media")); + 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 elem = Trusted::new(self); + + let context = Arc::new(Mutex::new(StylesheetContext { + elem: elem, + media: Some(media), + data: vec!(), + metadata: None, + url: url.clone(), + })); + + let (action_sender, action_receiver) = ipc::channel().unwrap(); + 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()); + }); + + if self.parser_inserted.get() { + document.increment_script_blocking_stylesheet_count(); + } - let referrer_policy = match self.RelList().Contains("noreferrer".into()) { - true => Some(ReferrerPolicy::NoReferrer), - false => None, - }; + 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); - } - Err(e) => debug!("Parsing url {} failed: {}", href, e) - } + document.load_async(LoadType::Stylesheet(url), response_target, referrer_policy); } fn handle_favicon_url(&self, rel: &str, href: &str, sizes: &Option<String>) { |