Allow empty media query list

And make empty list the default value of MediaList.

This commit also removes Option wrapper of Stylesheet.media because
a stylesheet should always have an associated media query list.

3 files changed, 3 insertions, 5 deletions

diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
index 9fb5a5609f1..90499388153 100644
--- a/components/script/dom/htmllinkelement.rs
+++ b/components/script/dom/htmllinkelement.rs
@@ -359,8 +359,7 @@ impl FetchResponseListener for StylesheetContext {
                                                    Some(environment_encoding), Origin::Author,
                                                    win.css_error_reporter(),
                                                    ParserContextExtraData::default());
-            let media = self.media.take().unwrap();
-            sheet.set_media(Some(media));
+            sheet.set_media(self.media.take().unwrap());
             let sheet = Arc::new(sheet);
 
             let win = window_from_node(&*elem);
diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs
index 14f9cd78555..7ddca9f2f8a 100644
--- a/components/script/dom/htmlmetaelement.rs
+++ b/components/script/dom/htmlmetaelement.rs
@@ -83,7 +83,7 @@ impl HTMLMetaElement {
                     *self.stylesheet.borrow_mut() = Some(Arc::new(Stylesheet {
                         rules: vec![CSSRule::Viewport(Arc::new(RwLock::new(translated_rule)))],
                         origin: Origin::Author,
-                        media: None,
+                        media: Default::default(),
                         // Viewport constraints are always recomputed on resize; they don't need to
                         // force all styles to be recomputed.
                         dirty_on_viewport_size_change: false,
diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs
index 34d5ba79ec9..8c1bc031dc0 100644
--- a/components/script/dom/htmlstyleelement.rs
+++ b/components/script/dom/htmlstyleelement.rs
@@ -65,8 +65,7 @@ impl HTMLStyleElement {
         let mut sheet = Stylesheet::from_str(&data, url, Origin::Author, win.css_error_reporter(),
                                              ParserContextExtraData::default());
         let mut css_parser = CssParser::new(&mq_str);
-        let media = parse_media_query_list(&mut css_parser);
-        sheet.set_media(Some(media));
+        sheet.set_media(parse_media_query_list(&mut css_parser));
         let sheet = Arc::new(sheet);
 
         win.layout_chan().send(Msg::AddStylesheet(sheet.clone())).unwrap();