Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +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

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(())
}