diff options
Diffstat (limited to 'components/script/dom/domparser.rs')
| -rw-r--r-- | components/script/dom/domparser.rs | 127 |
1 files changed, 68 insertions, 59 deletions
diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index 4af6ebf8c60..876d87eef25 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -1,97 +1,106 @@ /* 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 document_loader::DocumentLoader; -use dom::bindings::codegen::Bindings::DOMParserBinding; -use dom::bindings::codegen::Bindings::DOMParserBinding::DOMParserMethods; -use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Application_xhtml_xml; -use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Application_xml; -use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Text_html; -use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Text_xml; -use dom::bindings::codegen::Bindings::DocumentBinding::DocumentReadyState; -use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; -use dom::bindings::error::Fallible; -use dom::bindings::js::{JS, Root}; -use dom::bindings::reflector::{Reflector, reflect_dom_object}; -use dom::bindings::str::DOMString; -use dom::document::{Document, HasBrowsingContext, IsHTMLDocument}; -use dom::document::DocumentSource; -use dom::servoparser::ServoParser; -use dom::window::Window; +use crate::document_loader::DocumentLoader; +use crate::dom::bindings::codegen::Bindings::DOMParserBinding; +use crate::dom::bindings::codegen::Bindings::DOMParserBinding::DOMParserMethods; +use crate::dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Application_xhtml_xml; +use crate::dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Application_xml; +use crate::dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Text_html; +use crate::dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Text_xml; +use crate::dom::bindings::codegen::Bindings::DocumentBinding::DocumentReadyState; +use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; +use crate::dom::bindings::error::Fallible; +use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; +use crate::dom::bindings::root::{Dom, DomRoot}; +use crate::dom::bindings::str::DOMString; +use crate::dom::document::DocumentSource; +use crate::dom::document::{Document, HasBrowsingContext, IsHTMLDocument}; +use crate::dom::servoparser::ServoParser; +use crate::dom::window::Window; use dom_struct::dom_struct; use script_traits::DocumentActivity; #[dom_struct] pub struct DOMParser { reflector_: Reflector, - window: JS<Window>, // XXXjdm Document instead? + window: Dom<Window>, // XXXjdm Document instead? } impl DOMParser { fn new_inherited(window: &Window) -> DOMParser { DOMParser { reflector_: Reflector::new(), - window: JS::from_ref(window), + window: Dom::from_ref(window), } } - pub fn new(window: &Window) -> Root<DOMParser> { - reflect_dom_object(box DOMParser::new_inherited(window), - window, - DOMParserBinding::Wrap) + pub fn new(window: &Window) -> DomRoot<DOMParser> { + reflect_dom_object(Box::new(DOMParser::new_inherited(window)), window) } - pub fn Constructor(window: &Window) -> Fallible<Root<DOMParser>> { + #[allow(non_snake_case)] + pub fn Constructor(window: &Window) -> Fallible<DomRoot<DOMParser>> { Ok(DOMParser::new(window)) } } impl DOMParserMethods for DOMParser { // https://w3c.github.io/DOM-Parsing/#the-domparser-interface - fn ParseFromString(&self, - s: DOMString, - ty: DOMParserBinding::SupportedType) - -> Fallible<Root<Document>> { + fn ParseFromString( + &self, + s: DOMString, + ty: DOMParserBinding::SupportedType, + ) -> Fallible<DomRoot<Document>> { let url = self.window.get_url(); - let content_type = DOMString::from(ty.as_str()); + let content_type = ty + .as_str() + .parse() + .expect("Supported type is not a MIME type"); let doc = self.window.Document(); let loader = DocumentLoader::new(&*doc.loader()); match ty { Text_html => { - let document = Document::new(&self.window, - HasBrowsingContext::No, - Some(url.clone()), - doc.origin().clone(), - IsHTMLDocument::HTMLDocument, - Some(content_type), - None, - DocumentActivity::Inactive, - DocumentSource::FromParser, - loader, - None, - None); - ServoParser::parse_html_document(&document, s, url); + let document = Document::new( + &self.window, + HasBrowsingContext::No, + Some(url.clone()), + doc.origin().clone(), + IsHTMLDocument::HTMLDocument, + Some(content_type), + None, + DocumentActivity::Inactive, + DocumentSource::FromParser, + loader, + None, + None, + Default::default(), + ); + ServoParser::parse_html_document(&document, Some(s), url); document.set_ready_state(DocumentReadyState::Complete); Ok(document) - } + }, Text_xml | Application_xml | Application_xhtml_xml => { - // FIXME: this should probably be FromParser when we actually parse the string (#3756). - let document = Document::new(&self.window, - HasBrowsingContext::No, - Some(url.clone()), - doc.origin().clone(), - IsHTMLDocument::NonHTMLDocument, - Some(content_type), - None, - DocumentActivity::Inactive, - DocumentSource::NotFromParser, - loader, - None, - None); - ServoParser::parse_xml_document(&document, s, url); + let document = Document::new( + &self.window, + HasBrowsingContext::No, + Some(url.clone()), + doc.origin().clone(), + IsHTMLDocument::NonHTMLDocument, + Some(content_type), + None, + DocumentActivity::Inactive, + DocumentSource::FromParser, + loader, + None, + None, + Default::default(), + ); + ServoParser::parse_xml_document(&document, Some(s), url); + document.set_ready_state(DocumentReadyState::Complete); Ok(document) - } + }, } } } |