Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-18 21:34:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pass scripts as ~str to support non-ASCII string literals etc.

Browse source 
Of course scripts on the Web are not always encoded as UTF-8 and we will have
to deal with that at some point.
This commit is contained in:
Keegan McAllister 2013-10-15 18:14:15 -07:00
parent c539945401
commit 279ae53b7b
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/script/html/hubbub_html_parser.rs
View file

@ -19,6 +19,7 @@ use std::cast;
use std::cell::Cell;
use std::comm;
use std::comm::{Port, SharedChan};
use std::str;
use std::str::eq_slice;
use std::task;
use std::from_str::FromStr;
@ -102,7 +103,7 @@ macro_rules! handle_element_base(
pub struct JSFile {
data: ~[u8],
data: ~str,
url: Url
}
@ -222,11 +223,11 @@ fn js_script_listener(to_parent: SharedChan<HtmlDiscoveryMessage>,
let bytes = result_port.recv();
if bytes.is_some() {
result_vec.push(JSFile { data: bytes.unwrap(), url: url_clone });
result_vec.push(JSFile { data: str::from_utf8(bytes.unwrap()), url: url_clone });
}
}
JSTaskNewInlineScript(data, url) => {
result_vec.push(JSFile { data: data.into_bytes(), url: url });
result_vec.push(JSFile { data: data, url: url });
}
JSTaskExit => {
break;