diff options
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r-- | components/script/dom/window.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 91402fe6c1f..fe7ea336122 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -47,6 +47,7 @@ use libc; use serialize::base64::{FromBase64, ToBase64, STANDARD}; use std::cell::{Ref, RefMut}; use std::default::Default; +use std::ffi::CString; use std::rc::Rc; use time; @@ -283,9 +284,9 @@ impl<'a> WindowMethods for JSRef<'a, Window> { }) } - global_event_handlers!() - event_handler!(unload, GetOnunload, SetOnunload) - error_event_handler!(error, GetOnerror, SetOnerror) + global_event_handlers!(); + event_handler!(unload, GetOnunload, SetOnunload); + error_event_handler!(error, GetOnerror, SetOnerror); fn Screen(self) -> Temporary<Screen> { self.screen.or_init(|| Screen::new(self)) @@ -336,7 +337,7 @@ impl<'a, T: Reflectable> ScriptHelpers for JSRef<'a, T> { let global = global_object_for_js_object(this).root().r().reflector().get_jsobject(); let code: Vec<u16> = code.as_slice().utf16_units().collect(); let mut rval = UndefinedValue(); - let filename = filename.to_c_str(); + let filename = CString::from_slice(filename.as_bytes()); with_compartment(cx, global, || { unsafe { |