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

ChildrenOnly -> ChildrenOnly(Option<QualName>)

Browse source 
use this updated type from html5ever
This commit is contained in:
Jyotsna Prakash 2017-07-12 14:52:25 -07:00 • committed by Josh Matthews
parent a468d05fff
commit 6c0f87a1d6
14 changed files with 38 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/Cargo.toml
View file

@ -45,7 +45,7 @@ gleam = "0.4"
half = "1.0"
heapsize = "0.4"
heapsize_derive = "0.1"
html5ever = {version = "0.19", features = ["heap_size"]}
html5ever = {version = "0.20", features = ["heap_size"]}
hyper = "0.10"
hyper_serde = "0.7"
image = "0.14"
@ -90,7 +90,7 @@ unicode-segmentation = "1.1.0"
url = {version = "1.2", features = ["heap_size", "query_encoding"]}
utf-8 = "0.7"
uuid = {version = "0.5", features = ["v4"]}
xml5ever = {version = "0.9"}
xml5ever = {version = "0.10"}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webvr_traits = {path = "../webvr_traits"}

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

@ -2050,7 +2050,10 @@ impl ElementMethods for Element {
/// https://w3c.github.io/DOM-Parsing/#widl-Element-innerHTML
fn GetInnerHTML(&self) -> Fallible<DOMString> {
// XXX TODO: XML case
self.serialize(ChildrenOnly)
let qname = QualName::new(self.prefix().clone(),
self.namespace().clone(),
self.local_name().clone());
self.serialize(ChildrenOnly(Some(qname)))
}
/// https://w3c.github.io/DOM-Parsing/#widl-Element-innerHTML

4
components/script/dom/servoparser/html.rs
View file

@ -21,7 +21,7 @@ use html5ever::QualName;
use html5ever::buffer_queue::BufferQueue;
use html5ever::serialize::{AttrRef, Serialize, Serializer};
use html5ever::serialize::TraversalScope;
use html5ever::serialize::TraversalScope::ChildrenOnly;
use html5ever::serialize::TraversalScope::IncludeNode;
use html5ever::tokenizer::{Tokenizer as HtmlTokenizer, TokenizerOpts, TokenizerResult};
use html5ever::tree_builder::{Tracer as HtmlTracer, TreeBuilder, TreeBuilderOpts};
use js::jsapi::JSTracer;
@ -202,7 +202,7 @@ impl<'a> Serialize for &'a Node {
let node = *self;
let iter = SerializationIterator::new(node, traversal_scope == ChildrenOnly);
let iter = SerializationIterator::new(node, traversal_scope != IncludeNode);
for cmd in iter {
match cmd {