Merge remote-tracking branch 'upstream/master' into feat-cow-infra

`tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html`
was reverted to the upstream version.

1 files changed, 26 insertions, 22 deletions

diff --git a/components/script/dom/transitionevent.rs b/components/script/dom/transitionevent.rs
index 28aec7097f8..2305a9489ff 100644
--- a/components/script/dom/transitionevent.rs
+++ b/components/script/dom/transitionevent.rs
@@ -1,18 +1,19 @@
 /* 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::TransitionEventBinding;
-use dom::bindings::codegen::Bindings::TransitionEventBinding::{TransitionEventInit, TransitionEventMethods};
-use dom::bindings::error::Fallible;
-use dom::bindings::inheritance::Castable;
-use dom::bindings::js::Root;
-use dom::bindings::num::Finite;
-use dom::bindings::reflector::reflect_dom_object;
-use dom::bindings::str::DOMString;
-use dom::event::Event;
-use dom::window::Window;
+use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
+use crate::dom::bindings::codegen::Bindings::TransitionEventBinding::{
+    TransitionEventInit, TransitionEventMethods,
+};
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::num::Finite;
+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::window::Window;
 use dom_struct::dom_struct;
 use servo_atoms::Atom;
 
@@ -30,16 +31,16 @@ impl TransitionEvent {
             event: Event::new_inherited(),
             property_name: Atom::from(init.propertyName.clone()),
             elapsed_time: init.elapsedTime.clone(),
-            pseudo_element: init.pseudoElement.clone()
+            pseudo_element: init.pseudoElement.clone(),
         }
     }
 
-    pub fn new(window: &Window,
-               type_: Atom,
-               init: &TransitionEventInit) -> Root<TransitionEvent> {
-        let ev = reflect_dom_object(box TransitionEvent::new_inherited(init),
-                                    window,
-                                    TransitionEventBinding::Wrap);
+    pub fn new(
+        window: &Window,
+        type_: Atom,
+        init: &TransitionEventInit,
+    ) -> DomRoot<TransitionEvent> {
+        let ev = reflect_dom_object(Box::new(TransitionEvent::new_inherited(init)), window);
         {
             let event = ev.upcast::<Event>();
             event.init_event(type_, init.parent.bubbles, init.parent.cancelable);
@@ -47,9 +48,12 @@ impl TransitionEvent {
         ev
     }
 
-    pub fn Constructor(window: &Window,
-                       type_: DOMString,
-                       init: &TransitionEventInit) -> Fallible<Root<TransitionEvent>> {
+    #[allow(non_snake_case)]
+    pub fn Constructor(
+        window: &Window,
+        type_: DOMString,
+        init: &TransitionEventInit,
+    ) -> Fallible<DomRoot<TransitionEvent>> {
         Ok(TransitionEvent::new(window, Atom::from(type_), init))
     }
 }