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

Auto merge of #23427 - Eijebong:outdated5ever, r=jdm

Browse source 
Update xml5ever and html5ever

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23427)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-05-21 15:11:27 -04:00 • committed by GitHub
commit cde3ecf640
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/Cargo.toml
View file

@ -60,7 +60,7 @@ servo_allocator = {path = "../allocator"}
servo-fontconfig = "0.2.1"
[target.'cfg(target_os = "android")'.dependencies]
xml5ever = {version = "0.12"}
xml5ever = {version = "0.14"}
[target.'cfg(target_os = "windows")'.dependencies]
dwrote = "0.8"

2
components/layout/Cargo.toml
View file

@ -24,7 +24,7 @@ fnv = "1.0"
fxhash = "0.2"
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
html5ever = "0.22"
html5ever = "0.23"
ipc-channel = "0.11"
libc = "0.2"
log = "0.4"

2
components/layout_thread/Cargo.toml
View file

@ -24,7 +24,7 @@ fxhash = "0.2"
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
histogram = "0.6.8"
html5ever = "0.22"
html5ever = "0.23"
ipc-channel = "0.11"
layout = {path = "../layout"}
layout_traits = {path = "../layout_traits"}

2
components/malloc_size_of/Cargo.toml
View file

@ -43,5 +43,5 @@ thin-slice = "0.1.0"
time = { version = "0.1.17", optional = true }
url = { version = "1.2", optional = true }
webrender_api = { git = "https://github.com/servo/webrender", features = ["ipc"], optional = true }
xml5ever = { version = "0.12", optional = true }
xml5ever = { version = "0.14", optional = true }
void = "1.0.2"

4
components/script/Cargo.toml
View file

@ -56,7 +56,7 @@ fnv = "1.0"
gleam = "0.6"
headers-core = "0.0.1"
headers-ext = "0.0.3"
html5ever = "0.22"
html5ever = "0.23"
http = "0.1"
hyper = "0.12"
hyper_serde = "0.9"
@ -110,7 +110,7 @@ unicode-segmentation = "1.1.0"
url = "1.6"
utf-8 = "0.7"
uuid = {version = "0.7", features = ["v4"]}
xml5ever = {version = "0.12"}
xml5ever = {version = "0.14"}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webvr_traits = {path = "../webvr_traits"}

15
components/script/dom/servoparser/xml.rs
View file

@ -40,18 +40,9 @@ impl Tokenizer {
}
pub fn feed(&mut self, input: &mut BufferQueue) -> Result<(), DomRoot<HTMLScriptElement>> {
if !input.is_empty() {
while let Some(chunk) = input.pop_front() {
self.inner.feed(chunk);
if let Some(script) = self.inner.sink.sink.script.take() {
return Err(script);
}
}
} else {
self.inner.run();
if let Some(script) = self.inner.sink.sink.script.take() {
return Err(script);
}
self.inner.run(input);
if let Some(script) = self.inner.sink.sink.script.take() {
return Err(script);
}
Ok(())
}

2
components/script_layout_interface/Cargo.toml
View file

@ -18,7 +18,7 @@ cssparser = "0.25"
crossbeam-channel = "0.3"
euclid = "0.19"
gfx_traits = {path = "../gfx_traits"}
html5ever = "0.22"
html5ever = "0.23"
ipc-channel = "0.11"
libc = "0.2"
time = "0.1.17"

2
components/style/Cargo.toml
View file

@ -38,7 +38,7 @@ euclid = "0.19"
fallible = { path = "../fallible" }
fxhash = "0.2"
hashglobe = { path = "../hashglobe" }
html5ever = {version = "0.22", optional = true}
html5ever = {version = "0.23", optional = true}
indexmap = "1.0"
itertools = "0.8"
itoa = "0.4"