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

auto merge of #1077 : kmcallister/servo/jsstr, r=jdm

Browse source 
This doesn't resolve the big questions of how Servo will represent strings; it's just about doing the conversion correctly for our existing types.
This commit is contained in:
bors-servo 2013-10-17 16:34:30 -07:00
commit ebe1c1353c
5 changed files with 32 additions and 25 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;