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, 15 insertions, 18 deletions

diff --git a/components/script/dom/mimetypearray.rs b/components/script/dom/mimetypearray.rs
index 4bc33e9b237..9bbda92e231 100644
--- a/components/script/dom/mimetypearray.rs
+++ b/components/script/dom/mimetypearray.rs
@@ -1,14 +1,13 @@
 /* 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::codegen::Bindings::MimeTypeArrayBinding;
-use dom::bindings::codegen::Bindings::MimeTypeArrayBinding::MimeTypeArrayMethods;
-use dom::bindings::js::Root;
-use dom::bindings::reflector::{Reflector, reflect_dom_object};
-use dom::bindings::str::DOMString;
-use dom::globalscope::GlobalScope;
-use dom::mimetype::MimeType;
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::bindings::codegen::Bindings::MimeTypeArrayBinding::MimeTypeArrayMethods;
+use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::mimetype::MimeType;
 use dom_struct::dom_struct;
 
 #[dom_struct]
@@ -19,14 +18,12 @@ pub struct MimeTypeArray {
 impl MimeTypeArray {
     pub fn new_inherited() -> MimeTypeArray {
         MimeTypeArray {
-            reflector_: Reflector::new()
+            reflector_: Reflector::new(),
         }
     }
 
-    pub fn new(global: &GlobalScope) -> Root<MimeTypeArray> {
-        reflect_dom_object(box MimeTypeArray::new_inherited(),
-                           global,
-                           MimeTypeArrayBinding::Wrap)
+    pub fn new(global: &GlobalScope) -> DomRoot<MimeTypeArray> {
+        reflect_dom_object(Box::new(MimeTypeArray::new_inherited()), global)
     }
 }
 
@@ -37,22 +34,22 @@ impl MimeTypeArrayMethods for MimeTypeArray {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-mimetypearray-item
-    fn Item(&self, _index: u32) -> Option<Root<MimeType>> {
+    fn Item(&self, _index: u32) -> Option<DomRoot<MimeType>> {
         None
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-mimetypearray-nameditem
-    fn NamedItem(&self, _name: DOMString) -> Option<Root<MimeType>> {
+    fn NamedItem(&self, _name: DOMString) -> Option<DomRoot<MimeType>> {
         None
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-mimetypearray-item
-    fn IndexedGetter(&self, _index: u32) -> Option<Root<MimeType>> {
+    fn IndexedGetter(&self, _index: u32) -> Option<DomRoot<MimeType>> {
         None
     }
 
     // check-tidy: no specs after this line
-    fn NamedGetter(&self, _name: DOMString) -> Option<Root<MimeType>> {
+    fn NamedGetter(&self, _name: DOMString) -> Option<DomRoot<MimeType>> {
         None
     }