auto merge of #1811 : Ms2ger/servo/Wrap_, r=jdm

This commit is contained in:
bors-servo 2014-03-05 09:31:44 -05:00
commit da6a571f9e
28 changed files with 65 additions and 72 deletions

View file

@ -491,8 +491,8 @@ pub trait Reflectable {
pub fn reflect_dom_object<T: Reflectable>
(obj: ~T,
window: &window::Window,
wrap_fn: extern "Rust" fn(*JSContext, *JSObject, ~T) -> *JSObject)
window: &JS<window::Window>,
wrap_fn: extern "Rust" fn(*JSContext, &JS<window::Window>, ~T) -> *JSObject)
-> JS<T> {
JS::new(obj, window, wrap_fn)
}