diff options
author | Ms2ger <ms2ger@gmail.com> | 2014-03-08 20:12:16 +0100 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2014-03-09 18:51:38 +0100 |
commit | 84b0f45ed5d1e6fdff24c195699218c8743b561e (patch) | |
tree | 4f49bd39a063c765a3f1a4c147fc8bae785d7bef /src/components/script/dom/window.rs | |
parent | 9fbfb1909cde6225279730f123f312c270155d19 (diff) | |
download | servo-84b0f45ed5d1e6fdff24c195699218c8743b561e.tar.gz servo-84b0f45ed5d1e6fdff24c195699218c8743b561e.zip |
Use FooValue() functions.
Diffstat (limited to 'src/components/script/dom/window.rs')
-rw-r--r-- | src/components/script/dom/window.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 0382e03b9fb..7c3d2e90280 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -22,7 +22,8 @@ use servo_util::task::{spawn_named}; use js::glue::*; use js::jsapi::{JSObject, JSContext, JS_DefineProperty}; use js::jsval::JSVal; -use js::{JSVAL_NULL, JSPROP_ENUMERATE}; +use js::jsval::{NullValue, ObjectValue}; +use js::JSPROP_ENUMERATE; use std::cast; use std::comm::SharedChan; @@ -209,7 +210,7 @@ impl Window { } pub fn ShowModalDialog(&self, _cx: *JSContext, _url: DOMString, _argument: Option<JSVal>) -> JSVal { - JSVAL_NULL + NullValue() } } @@ -318,7 +319,7 @@ impl Window { for str in fn_names.iter() { (*str).to_c_str().with_ref(|name| { JS_DefineProperty(cx, global, name, - RUST_OBJECT_TO_JSVAL(global), + ObjectValue(&*global), Some(cast::transmute(GetJSClassHookStubPointer(PROPERTY_STUB))), Some(cast::transmute(GetJSClassHookStubPointer(STRICT_PROPERTY_STUB))), JSPROP_ENUMERATE); |