diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
| commit | f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8 (patch) | |
| tree | 7e7fbd7976c3da12ff463d6ffbeb1a3a336ae7d3 /src/components/script/html/cssparse.rs | |
| parent | caf1ed94468da3c134cc8e8f4a1b934bb353dc19 (diff) | |
| parent | a6100563a6e43471ae43fb155113bc2026992f78 (diff) | |
| download | servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.tar.gz servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.zip | |
auto merge of #1934 : larsbergstrom/servo/rust_20140224_squashed, r=jdm
For review only - don't approve yet (need to squash and land submodule updates first).
critic? @metajack
Diffstat (limited to 'src/components/script/html/cssparse.rs')
| -rw-r--r-- | src/components/script/html/cssparse.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/script/html/cssparse.rs b/src/components/script/html/cssparse.rs index 073b8562df4..846af813461 100644 --- a/src/components/script/html/cssparse.rs +++ b/src/components/script/html/cssparse.rs @@ -34,10 +34,11 @@ pub fn spawn_css_parser(provenance: StylesheetProvenance, resource_task.send(Load(url, input_chan)); let LoadResponse { metadata: metadata, progress_port: progress_port } = input_port.recv(); + let final_url = &metadata.final_url; let protocol_encoding_label = metadata.charset.as_ref().map(|s| s.as_slice()); let iter = ProgressMsgPortIterator { progress_port: progress_port }; Stylesheet::from_bytes_iter( - iter, metadata.final_url, + iter, final_url.clone(), protocol_encoding_label, Some(environment_encoding)) } InlineProvenance(base_url, data) => { |