Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

use XML fragment serialization for innerHTML in XML documents

Browse source
This commit is contained in:
tigercosmos 2017-10-15 21:48:14 +08:00
parent 4375a89f35
commit 06759fd0fd
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/script/dom/element.rs
View file

@ -120,6 +120,10 @@ use style::values::{CSSFloat, Either};
use style::values::{specified, computed};
use stylesheet_loader::StylesheetOwner;
use task::TaskOnce;
use xml5ever::serialize as xmlSerialize;
use xml5ever::serialize::SerializeOpts as XmlSerializeOpts;
use xml5ever::serialize::TraversalScope as XmlTraversalScope;
use xml5ever::serialize::TraversalScope::ChildrenOnly as XmlChildrenOnly;
// TODO: Update focus state when the top-level browsing context gains or loses system focus,
// and when the element enters or leaves a browsing context container.
@ -1004,6 +1008,19 @@ impl Element {
}
}
pub fn xmlSerialize(&self, traversal_scope: XmlTraversalScope) -> Fallible<DOMString> {
let mut writer = vec![];
match xmlSerialize::serialize(&mut writer,
&self.upcast::<Node>(),
XmlSerializeOpts {
traversal_scope: traversal_scope,
..Default::default()
}) {
Ok(()) => Ok(DOMString::from(String::from_utf8(writer).unwrap())),
Err(_) => panic!("Cannot serialize element"),
}
}
pub fn root_element(&self) -> DomRoot<Element> {
if self.node.is_in_doc() {
self.upcast::<Node>()
@ -2059,11 +2076,14 @@ impl ElementMethods for Element {
/// https://w3c.github.io/DOM-Parsing/#widl-Element-innerHTML
fn GetInnerHTML(&self) -> Fallible<DOMString> {
// XXX TODO: XML case
let qname = QualName::new(self.prefix().clone(),
self.namespace().clone(),
self.local_name().clone());
self.serialize(ChildrenOnly(Some(qname)))
if document_from_node(self).is_html_document() {
return self.serialize(ChildrenOnly(Some(qname)));
} else {
return self.xmlSerialize(XmlChildrenOnly(Some(qname)));
}
}
/// https://w3c.github.io/DOM-Parsing/#widl-Element-innerHTML

14
tests/wpt/metadata/domparsing/innerhtml-03.xhtml.ini
View file

@ -1,21 +1,7 @@
[innerhtml-03.xhtml]
type: testharness
[innerHTML in XHTML]
expected: FAIL
[innerHTML in XHTML 1]
expected: FAIL
[innerHTML in XHTML 2]
expected: FAIL
bug: https://github.com/servo/servo/issues/18776
[innerHTML in XHTML 3]
expected: FAIL
[innerHTML in XHTML 4]
expected: FAIL
[innerHTML in XHTML 7]
expected: FAIL