mirror of
https://github.com/servo/servo.git
synced 2025-06-26 01:54:33 +01:00
auto merge of #1077 : kmcallister/servo/jsstr, r=jdm
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:
commit
ebe1c1353c
5 changed files with 32 additions and 25 deletions
|
@ -30,6 +30,7 @@ use std::comm;
|
|||
use std::comm::{Port, SharedChan};
|
||||
use std::io::read_whole_file;
|
||||
use std::ptr;
|
||||
use std::str;
|
||||
use std::task::{spawn_sched, SingleThreaded};
|
||||
use std::util::replace;
|
||||
use dom::window::TimerData;
|
||||
|
@ -578,7 +579,7 @@ impl ScriptTask {
|
|||
Ok(bytes) => {
|
||||
compartment.define_functions(debug_fns);
|
||||
cx.evaluate_script(compartment.global_obj,
|
||||
bytes,
|
||||
str::from_utf8(bytes),
|
||||
url.path.clone(),
|
||||
1);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue