Skip to content

Commit

Permalink
Auto merge of #16989 - servo:packets, r=nox
Browse files Browse the repository at this point in the history
Decode UTF-8 code points across network packets

<s>Depends on https://github.com/servo/html5ever/pull/272</s>

<!-- 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/16989)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed May 27, 2017
2 parents 00a5da3 + 4e4b5ab commit b0c7c71
Show file tree
Hide file tree
Showing 13 changed files with 92 additions and 64 deletions.
43 changes: 20 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/layout/Cargo.toml
Expand Up @@ -20,7 +20,7 @@ fnv = "1.0"
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
html5ever = "0.16"
html5ever = "0.17"
ipc-channel = "0.7"
libc = "0.2"
log = "0.3.5"
Expand Down
4 changes: 2 additions & 2 deletions components/script/Cargo.toml
Expand Up @@ -48,7 +48,7 @@ gfx_traits = {path = "../gfx_traits"}
half = "1.0"
heapsize = "0.3.6"
heapsize_derive = "0.1"
html5ever = {version = "0.16", features = ["heap_size", "unstable"]}
html5ever = {version = "0.17", features = ["heap_size", "unstable"]}
hyper = "0.10"
hyper_serde = "0.6"
image = "0.12"
Expand Down Expand Up @@ -90,7 +90,7 @@ time = "0.1.12"
unicode-segmentation = "1.1.0"
url = {version = "1.2", features = ["heap_size", "query_encoding"]}
uuid = {version = "0.4", features = ["v4"]}
xml5ever = {version = "0.6", features = ["unstable"]}
xml5ever = {version = "0.7", features = ["unstable"]}
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webvr = {path = "../webvr"}
webvr_traits = {path = "../webvr_traits"}
3 changes: 2 additions & 1 deletion components/script/dom/bindings/trace.rs
Expand Up @@ -49,6 +49,7 @@ use euclid::rect::Rect;
use euclid::size::Size2D;
use html5ever::{Prefix, LocalName, Namespace, QualName};
use html5ever::buffer_queue::BufferQueue;
use html5ever::tendril::IncompleteUtf8;
use hyper::header::Headers;
use hyper::method::Method;
use hyper::mime::Mime;
Expand Down Expand Up @@ -341,7 +342,7 @@ unsafe_no_jsmanaged_fields!(BrowsingContextId, FrameType, PipelineId, TopLevelBr
unsafe_no_jsmanaged_fields!(TimerEventId, TimerSource);
unsafe_no_jsmanaged_fields!(TimelineMarkerType);
unsafe_no_jsmanaged_fields!(WorkerId);
unsafe_no_jsmanaged_fields!(BufferQueue, QuirksMode);
unsafe_no_jsmanaged_fields!(BufferQueue, QuirksMode, IncompleteUtf8);
unsafe_no_jsmanaged_fields!(Runtime);
unsafe_no_jsmanaged_fields!(Headers, Method);
unsafe_no_jsmanaged_fields!(WindowProxyHandler);
Expand Down
6 changes: 3 additions & 3 deletions components/script/dom/servoparser/html.rs
Expand Up @@ -87,7 +87,7 @@ impl Tokenizer {
}

pub fn url(&self) -> &ServoUrl {
&self.inner.sink().sink().base_url
&self.inner.sink.sink.base_url
}

pub fn set_plaintext_state(&mut self) {
Expand All @@ -109,9 +109,9 @@ unsafe impl JSTraceable for HtmlTokenizer<TreeBuilder<JS<Node>, Sink>> {
}
}

let tree_builder = self.sink();
let tree_builder = &self.sink;
tree_builder.trace_handles(&tracer);
tree_builder.sink().trace(trc);
tree_builder.sink.trace(trc);
}
}

Expand Down

0 comments on commit b0c7c71

Please sign in to comment.