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, 1 insertions, 10 deletions

diff --git a/components/script/lib.rs b/components/script/lib.rs
index 5125607219b..d7a57a28898 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -8,6 +8,7 @@
 #![feature(mpsc_select)]
 #![feature(plugin)]
 #![feature(string_retain)]
+#![feature(try_from)]
 #![feature(use_extern_macros)]
 
 #![deny(unsafe_code)]
@@ -149,10 +150,7 @@ pub mod layout_exports {
 }
 
 use dom::bindings::codegen::RegisterBindings;
-use dom::bindings::conversions::is_dom_proxy;
 use dom::bindings::proxyhandler;
-use dom::bindings::utils::is_platform_object;
-use js::jsapi::JSObject;
 use script_traits::SWManagerSenders;
 use serviceworker_manager::ServiceWorkerManager;
 
@@ -203,11 +201,6 @@ pub fn init_service_workers(sw_senders: SWManagerSenders) {
 }
 
 #[allow(unsafe_code)]
-unsafe extern "C" fn is_dom_object(obj: *mut JSObject) -> bool {
-  !obj.is_null() && (is_platform_object(obj) || is_dom_proxy(obj))
-}
-
-#[allow(unsafe_code)]
 pub fn init() {
     unsafe {
         proxyhandler::init();
@@ -215,8 +208,6 @@ pub fn init() {
         // Create the global vtables used by the (generated) DOM
         // bindings to implement JS proxies.
         RegisterBindings::RegisterProxyHandlers();
-
-        js::glue::InitializeMemoryReporter(Some(is_dom_object));
     }
 
     perform_platform_specific_initialization();