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, 38 insertions, 42 deletions

diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs
index f052c0eff44..abc579d8df9 100644
--- a/components/script/dom/closeevent.rs
+++ b/components/script/dom/closeevent.rs
@@ -1,17 +1,17 @@
 /* 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::CloseEventBinding;
-use dom::bindings::codegen::Bindings::CloseEventBinding::CloseEventMethods;
-use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
-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, EventBubbles, EventCancelable};
-use dom::globalscope::GlobalScope;
+use crate::dom::bindings::codegen::Bindings::CloseEventBinding;
+use crate::dom::bindings::codegen::Bindings::CloseEventBinding::CloseEventMethods;
+use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
+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, EventBubbles, EventCancelable};
+use crate::dom::globalscope::GlobalScope;
 use dom_struct::dom_struct;
 use servo_atoms::Atom;
 
@@ -23,6 +23,7 @@ pub struct CloseEvent {
     reason: DOMString,
 }
 
+#[allow(non_snake_case)]
 impl CloseEvent {
     pub fn new_inherited(was_clean: bool, code: u16, reason: DOMString) -> CloseEvent {
         CloseEvent {
@@ -33,46 +34,41 @@ impl CloseEvent {
         }
     }
 
-    pub fn new_uninitialized(global: &GlobalScope) -> Root<CloseEvent> {
-        reflect_dom_object(box CloseEvent::new_inherited(false, 0, DOMString::new()),
-                           global,
-                           CloseEventBinding::Wrap)
-    }
-
-    pub fn new(global: &GlobalScope,
-               type_: Atom,
-               bubbles: EventBubbles,
-               cancelable: EventCancelable,
-               wasClean: bool,
-               code: u16,
-               reason: DOMString)
-               -> Root<CloseEvent> {
-        let event = box CloseEvent::new_inherited(wasClean, code, reason);
-        let ev = reflect_dom_object(event, global, CloseEventBinding::Wrap);
+    pub fn new(
+        global: &GlobalScope,
+        type_: Atom,
+        bubbles: EventBubbles,
+        cancelable: EventCancelable,
+        wasClean: bool,
+        code: u16,
+        reason: DOMString,
+    ) -> DomRoot<CloseEvent> {
+        let event = Box::new(CloseEvent::new_inherited(wasClean, code, reason));
+        let ev = reflect_dom_object(event, global);
         {
             let event = ev.upcast::<Event>();
-            event.init_event(type_,
-                             bool::from(bubbles),
-                             bool::from(cancelable));
+            event.init_event(type_, bool::from(bubbles), bool::from(cancelable));
         }
         ev
     }
 
-    pub fn Constructor(global: &GlobalScope,
-                       type_: DOMString,
-                       init: &CloseEventBinding::CloseEventInit)
-                       -> Fallible<Root<CloseEvent>> {
+    pub fn Constructor(
+        global: &GlobalScope,
+        type_: DOMString,
+        init: &CloseEventBinding::CloseEventInit,
+    ) -> Fallible<DomRoot<CloseEvent>> {
         let bubbles = EventBubbles::from(init.parent.bubbles);
         let cancelable = EventCancelable::from(init.parent.cancelable);
-        Ok(CloseEvent::new(global,
-                           Atom::from(type_),
-                           bubbles,
-                           cancelable,
-                           init.wasClean,
-                           init.code,
-                           init.reason.clone()))
+        Ok(CloseEvent::new(
+            global,
+            Atom::from(type_),
+            bubbles,
+            cancelable,
+            init.wasClean,
+            init.code,
+            init.reason.clone(),
+        ))
     }
-
 }
 
 impl CloseEventMethods for CloseEvent {