forked from mirrors/gecko-dev
6eca17590c
<!-- Please describe your changes on the following line: --> This pull request adds support for "application/xml" and "application/xhtml+xml" to DOMParser::parseFromString. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #11505 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 196adaff07201deb273077213fa63c460cc11629
91 lines
3.9 KiB
Rust
91 lines
3.9 KiB
Rust
/* 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 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::global::GlobalRef;
|
|
use dom::bindings::js::{JS, Root};
|
|
use dom::bindings::reflector::{Reflector, reflect_dom_object};
|
|
use dom::bindings::str::DOMString;
|
|
use dom::document::DocumentSource;
|
|
use dom::document::{Document, IsHTMLDocument};
|
|
use dom::window::Window;
|
|
use parse::html::{ParseContext, parse_html};
|
|
use parse::xml::{self, parse_xml};
|
|
|
|
#[dom_struct]
|
|
pub struct DOMParser {
|
|
reflector_: Reflector,
|
|
window: JS<Window>, // XXXjdm Document instead?
|
|
}
|
|
|
|
impl DOMParser {
|
|
fn new_inherited(window: &Window) -> DOMParser {
|
|
DOMParser {
|
|
reflector_: Reflector::new(),
|
|
window: JS::from_ref(window),
|
|
}
|
|
}
|
|
|
|
pub fn new(window: &Window) -> Root<DOMParser> {
|
|
reflect_dom_object(box DOMParser::new_inherited(window),
|
|
GlobalRef::Window(window),
|
|
DOMParserBinding::Wrap)
|
|
}
|
|
|
|
pub fn Constructor(global: GlobalRef) -> Fallible<Root<DOMParser>> {
|
|
Ok(DOMParser::new(global.as_window()))
|
|
}
|
|
}
|
|
|
|
impl DOMParserMethods for DOMParser {
|
|
// https://domparsing.spec.whatwg.org/#the-domparser-interface
|
|
fn ParseFromString(&self,
|
|
s: DOMString,
|
|
ty: DOMParserBinding::SupportedType)
|
|
-> Fallible<Root<Document>> {
|
|
let url = self.window.get_url();
|
|
let content_type =
|
|
DOMString::from(DOMParserBinding::SupportedTypeValues::strings[ty as usize]);
|
|
let doc = self.window.Document();
|
|
let doc = doc.r();
|
|
let loader = DocumentLoader::new(&*doc.loader());
|
|
match ty {
|
|
Text_html => {
|
|
let document = Document::new(&self.window,
|
|
None,
|
|
Some(url.clone()),
|
|
IsHTMLDocument::HTMLDocument,
|
|
Some(content_type),
|
|
None,
|
|
DocumentSource::FromParser,
|
|
loader);
|
|
parse_html(document.r(), s, url, ParseContext::Owner(None));
|
|
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,
|
|
None,
|
|
Some(url.clone()),
|
|
IsHTMLDocument::NonHTMLDocument,
|
|
Some(content_type),
|
|
None,
|
|
DocumentSource::NotFromParser,
|
|
loader);
|
|
parse_xml(document.r(), s, url, xml::ParseContext::Owner(None));
|
|
Ok(document)
|
|
}
|
|
}
|
|
}
|
|
}
|