diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-06-26 18:51:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 18:51:14 -0400 |
| commit | 57205318c5f76fead08e6410512bad86c6d04739 (patch) | |
| tree | aec57e35501e04290e25f2b006dcbc1547d33315 /components/script/dom/promise.rs | |
| parent | d170f43b53c840b5f6a1f657968092c096a171e9 (diff) | |
| parent | 63714c90fb5bbad86f28fc188120b2ecfd3337ab (diff) | |
| download | servo-57205318c5f76fead08e6410512bad86c6d04739.tar.gz servo-57205318c5f76fead08e6410512bad86c6d04739.zip | |
Auto merge of #23587 - jdm:smup67, r=asajeffrey
Upgrade to SpiderMonkey 67
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23587)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/promise.rs')
| -rw-r--r-- | components/script/dom/promise.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs index 152828b8110..9fcb728ae0f 100644 --- a/components/script/dom/promise.rs +++ b/components/script/dom/promise.rs @@ -286,7 +286,7 @@ unsafe extern "C" fn native_handler_callback( rooted!(in(cx) let v = *GetFunctionNativeReserved(args.callee(), SLOT_NATIVEHANDLER)); assert!(v.get().is_object()); - let handler = root_from_object::<PromiseNativeHandler>(v.to_object()) + let handler = root_from_object::<PromiseNativeHandler>(v.to_object(), cx) .expect("unexpected value for native handler in promise native handler callback"); rooted!(in(cx) let v = *GetFunctionNativeReserved(args.callee(), SLOT_NATIVEHANDLER_TASK)); |