1 files changed, 38 insertions, 87 deletions
diff --git a/components/script/dom/mediaquerylist.rs b/components/script/dom/mediaquerylist.rs
index dafc7602794..48080f95adf 100644
--- a/components/script/dom/mediaquerylist.rs
+++ b/components/script/dom/mediaquerylist.rs
@@ -1,28 +1,21 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use dom::bindings::cell::DOMRefCell;
-use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
-use dom::bindings::codegen::Bindings::EventListenerBinding::EventListener;
-use dom::bindings::codegen::Bindings::EventTargetBinding::EventTargetMethods;
-use dom::bindings::codegen::Bindings::MediaQueryListBinding::{self, MediaQueryListMethods};
-use dom::bindings::inheritance::Castable;
-use dom::bindings::js::{JS, Root};
-use dom::bindings::reflector::DomObject;
-use dom::bindings::reflector::reflect_dom_object;
-use dom::bindings::str::DOMString;
-use dom::bindings::trace::JSTraceable;
-use dom::bindings::weakref::{WeakRef, WeakRefVec};
-use dom::document::Document;
-use dom::event::Event;
-use dom::eventtarget::EventTarget;
-use dom::mediaquerylistevent::MediaQueryListEvent;
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::bindings::codegen::Bindings::EventListenerBinding::EventListener;
+use crate::dom::bindings::codegen::Bindings::EventTargetBinding::AddEventListenerOptions;
+use crate::dom::bindings::codegen::Bindings::EventTargetBinding::EventListenerOptions;
+use crate::dom::bindings::codegen::Bindings::MediaQueryListBinding::MediaQueryListMethods;
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::reflector::reflect_dom_object;
+use crate::dom::bindings::root::{Dom, DomRoot};
+use crate::dom::bindings::str::DOMString;
+use crate::dom::document::Document;
+use crate::dom::eventtarget::EventTarget;
 use dom_struct::dom_struct;
-use js::jsapi::JSTracer;
 use std::cell::Cell;
 use std::rc::Rc;
-use style::media_queries::{Device, MediaList, MediaType};
+use style::media_queries::MediaList;
 use style_traits::ToCss;
 
 pub enum MediaQueryListMatchState {
@@ -33,30 +26,31 @@ pub enum MediaQueryListMatchState {
 #[dom_struct]
 pub struct MediaQueryList {
     eventtarget: EventTarget,
-    document: JS<Document>,
+    document: Dom<Document>,
     media_query_list: MediaList,
-    last_match_state: Cell<Option<bool>>
+    last_match_state: Cell<Option<bool>>,
 }
 
 impl MediaQueryList {
     fn new_inherited(document: &Document, media_query_list: MediaList) -> MediaQueryList {
         MediaQueryList {
             eventtarget: EventTarget::new_inherited(),
-            document: JS::from_ref(document),
+            document: Dom::from_ref(document),
             media_query_list: media_query_list,
             last_match_state: Cell::new(None),
         }
     }
 
-    pub fn new(document: &Document, media_query_list: MediaList) -> Root<MediaQueryList> {
-        reflect_dom_object(box MediaQueryList::new_inherited(document, media_query_list),
-                           document.window(),
-                           MediaQueryListBinding::Wrap)
+    pub fn new(document: &Document, media_query_list: MediaList) -> DomRoot<MediaQueryList> {
+        reflect_dom_object(
+            Box::new(MediaQueryList::new_inherited(document, media_query_list)),
+            document.window(),
+        )
     }
 }
 
 impl MediaQueryList {
-    fn evaluate_changes(&self) -> MediaQueryListMatchState {
+    pub fn evaluate_changes(&self) -> MediaQueryListMatchState {
         let matches = self.evaluate();
 
         let result = if let Some(old_matches) = self.last_match_state.get() {
@@ -74,22 +68,15 @@ impl MediaQueryList {
     }
 
     pub fn evaluate(&self) -> bool {
-        if let Some(window_size) = self.document.window().window_size() {
-            let viewport_size = window_size.initial_viewport;
-            let device = Device::new(MediaType::Screen, viewport_size);
-            self.media_query_list.evaluate(&device)
-        } else {
-            false
-        }
+        self.media_query_list
+            .evaluate(&self.document.device(), self.document.quirks_mode())
     }
 }
 
 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
@@ -102,61 +89,25 @@ impl MediaQueryListMethods for MediaQueryList {
 
     // https://drafts.csswg.org/cssom-view/#dom-mediaquerylist-addlistener
     fn AddListener(&self, listener: Option<Rc<EventListener>>) {
-        self.upcast::<EventTarget>().AddEventListener(DOMString::from_string("change".to_owned()),
-                                                      listener, false);
+        self.upcast::<EventTarget>().add_event_listener(
+            DOMString::from_string("change".to_owned()),
+            listener,
+            AddEventListenerOptions {
+                parent: EventListenerOptions { capture: false },
+                once: false,
+            },
+        );
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-mediaquerylist-removelistener
     fn RemoveListener(&self, listener: Option<Rc<EventListener>>) {
-        self.upcast::<EventTarget>().RemoveEventListener(DOMString::from_string("change".to_owned()),
-                                                         listener, false);
+        self.upcast::<EventTarget>().remove_event_listener(
+            DOMString::from_string("change".to_owned()),
+            listener,
+            EventListenerOptions { capture: false },
+        );
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-mediaquerylist-onchange
     event_handler!(change, GetOnchange, SetOnchange);
 }
-
-#[derive(HeapSizeOf)]
-pub struct WeakMediaQueryListVec {
-    cell: DOMRefCell<WeakRefVec<MediaQueryList>>,
-}
-
-impl WeakMediaQueryListVec {
-    /// Create a new vector of weak references to MediaQueryList
-    pub fn new() -> Self {
-        WeakMediaQueryListVec { cell: DOMRefCell::new(WeakRefVec::new()) }
-    }
-
-    pub fn push(&self, mql: &MediaQueryList) {
-        self.cell.borrow_mut().push(WeakRef::new(mql));
-    }
-
-    /// Evaluate media query lists and report changes
-    /// https://drafts.csswg.org/cssom-view/#evaluate-media-queries-and-report-changes
-    pub fn evaluate_and_report_changes(&self) {
-        rooted_vec!(let mut mql_list);
-        self.cell.borrow_mut().update(|mql| {
-            let mql = mql.root().unwrap();
-            if let MediaQueryListMatchState::Changed(_) = mql.evaluate_changes() {
-                // Recording list of changed Media Queries
-                mql_list.push(JS::from_ref(&*mql));
-            }
-        });
-        // Sending change events for all changed Media Queries
-        for mql in mql_list.iter() {
-            let event = MediaQueryListEvent::new(&mql.global(),
-                                                 atom!("change"),
-                                                 false, false,
-                                                 mql.Media(),
-                                                 mql.Matches());
-            event.upcast::<Event>().fire(mql.upcast::<EventTarget>());
-        }
-    }
-}
-
-#[allow(unsafe_code)]
-unsafe impl JSTraceable for WeakMediaQueryListVec {
-    unsafe fn trace(&self, _: *mut JSTracer) {
-        self.cell.borrow_mut().retain_alive()
-    }
-}