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

diff --git a/components/script/dom/comment.rs b/components/script/dom/comment.rs
index ad512132698..d87f4d77094 100644
--- a/components/script/dom/comment.rs
+++ b/components/script/dom/comment.rs
@@ -1,16 +1,15 @@
 /* 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::CommentBinding;
-use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
-use dom::bindings::error::Fallible;
-use dom::bindings::js::Root;
-use dom::bindings::str::DOMString;
-use dom::characterdata::CharacterData;
-use dom::document::Document;
-use dom::node::Node;
-use dom::window::Window;
+use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::characterdata::CharacterData;
+use crate::dom::document::Document;
+use crate::dom::node::Node;
+use crate::dom::window::Window;
 use dom_struct::dom_struct;
 
 /// An HTML comment.
@@ -26,13 +25,12 @@ impl Comment {
         }
     }
 
-    pub fn new(text: DOMString, document: &Document) -> Root<Comment> {
-        Node::reflect_node(box Comment::new_inherited(text, document),
-                           document,
-                           CommentBinding::Wrap)
+    pub fn new(text: DOMString, document: &Document) -> DomRoot<Comment> {
+        Node::reflect_node(Box::new(Comment::new_inherited(text, document)), document)
     }
 
-    pub fn Constructor(window: &Window, data: DOMString) -> Fallible<Root<Comment>> {
+    #[allow(non_snake_case)]
+    pub fn Constructor(window: &Window, data: DOMString) -> Fallible<DomRoot<Comment>> {
         let document = window.Document();
         Ok(Comment::new(data, &document))
     }