2 files changed, 6 insertions, 9 deletions
diff --git a/components/script/dom/medialist.rs b/components/script/dom/medialist.rs
index 6ae318da582..449c3c19ea6 100644
--- a/components/script/dom/medialist.rs
+++ b/components/script/dom/medialist.rs
@@ -93,12 +93,11 @@ impl MediaListMethods for MediaList {
     // https://drafts.csswg.org/cssom/#dom-medialist-item
     fn Item(&self, index: u32) -> Option<DOMString> {
         let guard = self.shared_lock().read();
-        self.media_queries.read_with(&guard).media_queries
-        .get(index as usize).and_then(|query| {
-            let mut s = String::new();
-            query.to_css(&mut s).unwrap();
-            Some(DOMString::from_string(s))
-        })
+        self.media_queries
+            .read_with(&guard)
+            .media_queries
+            .get(index as usize)
+            .map(|query| query.to_css_string().into())
     }
 
     // https://drafts.csswg.org/cssom/#dom-medialist-item
diff --git a/components/script/dom/mediaquerylist.rs b/components/script/dom/mediaquerylist.rs
index e89e7d4d744..4c6be0091b1 100644
--- a/components/script/dom/mediaquerylist.rs
+++ b/components/script/dom/mediaquerylist.rs
@@ -83,9 +83,7 @@ impl MediaQueryList {
 impl MediaQueryListMethods for MediaQueryList {
     // https://drafts.csswg.org/cssom-view/#dom-mediaquerylist-media
     fn Media(&self) -> DOMString {
-        let mut s = String::new();
-        self.media_query_list.to_css(&mut s).unwrap();
-        DOMString::from_string(s)
+        self.media_query_list.to_css_string().into()
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-mediaquerylist-matches