Auto merge of #21029 - asajeffrey:smup, r=Manishearth,nox

Upgrade to SM 60

<!-- Please describe your changes on the following line: -->

This is the mozjs_sys smup PR. Depends on https://github.com/servo/mozjs/pull/138 and https://github.com/servo/rust-mozjs/pull/430.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #20585
<!-- Either: -->
- [X] These changes do not require tests because the existing tests will ensure SM is still working

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/21029)
<!-- Reviewable:end -->

1 files changed, 8 insertions, 7 deletions

diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index fe3a1fdbc12..f15e2824db4 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -60,9 +60,12 @@ use euclid::{Point2D, Vector2D, Rect, Size2D, TypedPoint2D, TypedScale, TypedSiz
 use fetch;
 use ipc_channel::ipc::IpcSender;
 use ipc_channel::router::ROUTER;
-use js::jsapi::{JSAutoCompartment, JSContext};
-use js::jsapi::{JS_GC, JS_GetRuntime, JSPROP_ENUMERATE};
-use js::jsval::{JSVal, UndefinedValue};
+use js::jsapi::JSAutoCompartment;
+use js::jsapi::JSContext;
+use js::jsapi::JSPROP_ENUMERATE;
+use js::jsapi::JS_GC;
+use js::jsval::JSVal;
+use js::jsval::UndefinedValue;
 use js::rust::HandleValue;
 use js::rust::wrappers::JS_DefineProperty;
 use layout_image::fetch_image_for_layout;
@@ -595,9 +598,7 @@ impl WindowMethods for Window {
                                   obj,
                                   "opener\0".as_ptr() as *const libc::c_char,
                                   value,
-                                  JSPROP_ENUMERATE,
-                                  None,
-                                  None));
+                                  JSPROP_ENUMERATE as u32));
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-window-closed
@@ -878,7 +879,7 @@ impl WindowMethods for Window {
     #[allow(unsafe_code)]
     fn Gc(&self) {
         unsafe {
-            JS_GC(JS_GetRuntime(self.get_cx()));
+            JS_GC(self.get_cx());
         }
     }