1 files changed, 44 insertions, 30 deletions
diff --git a/components/script/dom/mediaquerylistevent.rs b/components/script/dom/mediaquerylistevent.rs
index 18be8b1d1b5..c34c3d5116f 100644
--- a/components/script/dom/mediaquerylistevent.rs
+++ b/components/script/dom/mediaquerylistevent.rs
@@ -1,19 +1,18 @@
 /* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
-use dom::bindings::codegen::Bindings::MediaQueryListEventBinding;
-use dom::bindings::codegen::Bindings::MediaQueryListEventBinding::MediaQueryListEventInit;
-use dom::bindings::codegen::Bindings::MediaQueryListEventBinding::MediaQueryListEventMethods;
-use dom::bindings::error::Fallible;
-use dom::bindings::inheritance::Castable;
-use dom::bindings::js::Root;
-use dom::bindings::reflector::reflect_dom_object;
-use dom::bindings::str::DOMString;
-use dom::event::Event;
-use dom::globalscope::GlobalScope;
-use dom::window::Window;
+use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
+use crate::dom::bindings::codegen::Bindings::MediaQueryListEventBinding::MediaQueryListEventInit;
+use crate::dom::bindings::codegen::Bindings::MediaQueryListEventBinding::MediaQueryListEventMethods;
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::reflector::reflect_dom_object;
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::event::Event;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::window::Window;
 use dom_struct::dom_struct;
 use servo_atoms::Atom;
 use std::cell::Cell;
@@ -23,24 +22,31 @@ use std::cell::Cell;
 pub struct MediaQueryListEvent {
     event: Event,
     media: DOMString,
-    matches: Cell<bool>
+    matches: Cell<bool>,
 }
 
 impl MediaQueryListEvent {
-    pub fn new_initialized(global: &GlobalScope,
-                           media: DOMString,
-                           matches: bool) -> Root<MediaQueryListEvent> {
-        let ev = box MediaQueryListEvent {
+    pub fn new_initialized(
+        global: &GlobalScope,
+        media: DOMString,
+        matches: bool,
+    ) -> DomRoot<MediaQueryListEvent> {
+        let ev = Box::new(MediaQueryListEvent {
             event: Event::new_inherited(),
             media: media,
-            matches: Cell::new(matches)
-        };
-        reflect_dom_object(ev, global, MediaQueryListEventBinding::Wrap)
+            matches: Cell::new(matches),
+        });
+        reflect_dom_object(ev, global)
     }
 
-    pub fn new(global: &GlobalScope, type_: Atom,
-               bubbles: bool, cancelable: bool,
-               media: DOMString, matches: bool) -> Root<MediaQueryListEvent> {
+    pub fn new(
+        global: &GlobalScope,
+        type_: Atom,
+        bubbles: bool,
+        cancelable: bool,
+        media: DOMString,
+        matches: bool,
+    ) -> DomRoot<MediaQueryListEvent> {
         let ev = MediaQueryListEvent::new_initialized(global, media, matches);
         {
             let event = ev.upcast::<Event>();
@@ -49,13 +55,21 @@ impl MediaQueryListEvent {
         ev
     }
 
-    pub fn Constructor(window: &Window, type_: DOMString,
-                       init: &MediaQueryListEventInit)
-                       -> Fallible<Root<MediaQueryListEvent>> {
+    #[allow(non_snake_case)]
+    pub fn Constructor(
+        window: &Window,
+        type_: DOMString,
+        init: &MediaQueryListEventInit,
+    ) -> Fallible<DomRoot<MediaQueryListEvent>> {
         let global = window.upcast::<GlobalScope>();
-        Ok(MediaQueryListEvent::new(global, Atom::from(type_),
-                                    init.parent.bubbles, init.parent.cancelable,
-                                    init.media.clone(), init.matches))
+        Ok(MediaQueryListEvent::new(
+            global,
+            Atom::from(type_),
+            init.parent.bubbles,
+            init.parent.cancelable,
+            init.media.clone(),
+            init.matches,
+        ))
     }
 }