aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/abstractworker.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-08-20 18:23:22 -0400
committerGitHub <noreply@github.com>2018-08-20 18:23:22 -0400
commit5c8ede4b05f3940cfaa94d6341984502c920685d (patch)
treea80924c2d87b67e8963c1f23dee425f012ed23a5 /components/script/dom/abstractworker.rs
parent561908a965e6eef79800d3cc7598e5e6ea534cf9 (diff)
parent74c1e00d8163f255bb4141ff3549bbdedd7ea766 (diff)
downloadservo-5c8ede4b05f3940cfaa94d6341984502c920685d.tar.gz
servo-5c8ede4b05f3940cfaa94d6341984502c920685d.zip
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 -->
Diffstat (limited to 'components/script/dom/abstractworker.rs')
-rw-r--r--components/script/dom/abstractworker.rs24
1 files changed, 0 insertions, 24 deletions
diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs
index fec71495613..9a72316810b 100644
--- a/components/script/dom/abstractworker.rs
+++ b/components/script/dom/abstractworker.rs
@@ -5,8 +5,6 @@
use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::DomObject;
use dom::bindings::structuredclone::StructuredCloneData;
-use js::jsapi::{JSRuntime, JS_RequestInterruptCallback};
-use js::rust::Runtime;
use script_runtime::CommonScriptMsg;
/// Messages used to control the worker event loops
@@ -28,25 +26,3 @@ impl<T: DomObject> SimpleWorkerErrorHandler<T> {
}
}
}
-
-#[derive(Clone, Copy)]
-pub struct SharedRt {
- rt: *mut JSRuntime
-}
-
-impl SharedRt {
- pub fn new(rt: &Runtime) -> SharedRt {
- SharedRt {
- rt: rt.rt()
- }
- }
-
- #[allow(unsafe_code)]
- pub fn request_interrupt(&self) {
- unsafe {
- JS_RequestInterruptCallback(self.rt);
- }
- }
-}
-#[allow(unsafe_code)]
-unsafe impl Send for SharedRt {}