diff options
Diffstat (limited to 'components/script/dom/bindings/iterable.rs')
| -rw-r--r-- | components/script/dom/bindings/iterable.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/components/script/dom/bindings/iterable.rs b/components/script/dom/bindings/iterable.rs index d736d3f1b6b..5ee790cf2d3 100644 --- a/components/script/dom/bindings/iterable.rs +++ b/components/script/dom/bindings/iterable.rs @@ -76,41 +76,41 @@ impl<T: DomObject + JSTraceable + Iterable> IterableIterator<T> { /// Return the next value from the iterable object. #[allow(non_snake_case)] - pub fn Next(&self, cx: *mut JSContext) -> Fallible<NonNull<JSObject>> { + pub fn Next(&self, cx: SafeJSContext) -> Fallible<NonNull<JSObject>> { let index = self.index.get(); - rooted!(in(cx) let mut value = UndefinedValue()); - rooted!(in(cx) let mut rval = ptr::null_mut::<JSObject>()); + rooted!(in(*cx) let mut value = UndefinedValue()); + rooted!(in(*cx) let mut rval = ptr::null_mut::<JSObject>()); let result = if index >= self.iterable.get_iterable_length() { - dict_return(cx, rval.handle_mut(), true, value.handle()) + dict_return(*cx, rval.handle_mut(), true, value.handle()) } else { match self.type_ { IteratorType::Keys => { unsafe { self.iterable .get_key_at_index(index) - .to_jsval(cx, value.handle_mut()); + .to_jsval(*cx, value.handle_mut()); } - dict_return(cx, rval.handle_mut(), false, value.handle()) + dict_return(*cx, rval.handle_mut(), false, value.handle()) }, IteratorType::Values => { unsafe { self.iterable .get_value_at_index(index) - .to_jsval(cx, value.handle_mut()); + .to_jsval(*cx, value.handle_mut()); } - dict_return(cx, rval.handle_mut(), false, value.handle()) + dict_return(*cx, rval.handle_mut(), false, value.handle()) }, IteratorType::Entries => { - rooted!(in(cx) let mut key = UndefinedValue()); + rooted!(in(*cx) let mut key = UndefinedValue()); unsafe { self.iterable .get_key_at_index(index) - .to_jsval(cx, key.handle_mut()); + .to_jsval(*cx, key.handle_mut()); self.iterable .get_value_at_index(index) - .to_jsval(cx, value.handle_mut()); + .to_jsval(*cx, value.handle_mut()); } - key_and_value_return(cx, rval.handle_mut(), key.handle(), value.handle()) + key_and_value_return(*cx, rval.handle_mut(), key.handle(), value.handle()) }, } }; |