diff options
author | yvt <i@yvt.jp> | 2021-07-10 17:24:27 +0900 |
---|---|---|
committer | yvt <i@yvt.jp> | 2021-07-10 17:55:42 +0900 |
commit | 01a7de50ab1843d85295f9dccad7f4c099e7208c (patch) | |
tree | ee53fb6e8889deb7b880ee969e6c662e6128d210 /components/script/dom/processinginstruction.rs | |
parent | ff8d2cdbbfc7a9dc7f38b7dd47cb350fde39388f (diff) | |
parent | 94b613fbdaa2b98f2179fc0bbda13c64e6fa0d38 (diff) | |
download | servo-01a7de50ab1843d85295f9dccad7f4c099e7208c.tar.gz servo-01a7de50ab1843d85295f9dccad7f4c099e7208c.zip |
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.
Diffstat (limited to 'components/script/dom/processinginstruction.rs')
-rw-r--r-- | components/script/dom/processinginstruction.rs | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/components/script/dom/processinginstruction.rs b/components/script/dom/processinginstruction.rs index 31e6737a977..9edbf1a0a29 100644 --- a/components/script/dom/processinginstruction.rs +++ b/components/script/dom/processinginstruction.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/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::Bindings::ProcessingInstructionBinding; -use dom::bindings::codegen::Bindings::ProcessingInstructionBinding::ProcessingInstructionMethods; -use dom::bindings::js::Root; -use dom::bindings::str::DOMString; -use dom::characterdata::CharacterData; -use dom::document::Document; -use dom::node::Node; +use crate::dom::bindings::codegen::Bindings::ProcessingInstructionBinding::ProcessingInstructionMethods; +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 dom_struct::dom_struct; /// An HTML processing instruction node. @@ -19,20 +18,29 @@ pub struct ProcessingInstruction { } impl ProcessingInstruction { - fn new_inherited(target: DOMString, data: DOMString, document: &Document) -> ProcessingInstruction { + fn new_inherited( + target: DOMString, + data: DOMString, + document: &Document, + ) -> ProcessingInstruction { ProcessingInstruction { characterdata: CharacterData::new_inherited(data, document), - target: target + target: target, } } - pub fn new(target: DOMString, data: DOMString, document: &Document) -> Root<ProcessingInstruction> { - Node::reflect_node(box ProcessingInstruction::new_inherited(target, data, document), - document, ProcessingInstructionBinding::Wrap) + pub fn new( + target: DOMString, + data: DOMString, + document: &Document, + ) -> DomRoot<ProcessingInstruction> { + Node::reflect_node( + Box::new(ProcessingInstruction::new_inherited(target, data, document)), + document, + ) } } - impl ProcessingInstruction { pub fn target(&self) -> &DOMString { &self.target |