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, 8 insertions, 11 deletions

diff --git a/components/script/dom/xmlhttprequestupload.rs b/components/script/dom/xmlhttprequestupload.rs
index 02a54001388..7e7b5893395 100644
--- a/components/script/dom/xmlhttprequestupload.rs
+++ b/components/script/dom/xmlhttprequestupload.rs
@@ -1,17 +1,16 @@
 /* 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::XMLHttpRequestUploadBinding;
-use dom::bindings::js::Root;
-use dom::bindings::reflector::reflect_dom_object;
-use dom::globalscope::GlobalScope;
-use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget;
+use crate::dom::bindings::reflector::reflect_dom_object;
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget;
 use dom_struct::dom_struct;
 
 #[dom_struct]
 pub struct XMLHttpRequestUpload {
-    eventtarget: XMLHttpRequestEventTarget
+    eventtarget: XMLHttpRequestEventTarget,
 }
 
 impl XMLHttpRequestUpload {
@@ -20,9 +19,7 @@ impl XMLHttpRequestUpload {
             eventtarget: XMLHttpRequestEventTarget::new_inherited(),
         }
     }
-    pub fn new(global: &GlobalScope) -> Root<XMLHttpRequestUpload> {
-        reflect_dom_object(box XMLHttpRequestUpload::new_inherited(),
-                           global,
-                           XMLHttpRequestUploadBinding::Wrap)
+    pub fn new(global: &GlobalScope) -> DomRoot<XMLHttpRequestUpload> {
+        reflect_dom_object(Box::new(XMLHttpRequestUpload::new_inherited()), global)
     }
 }