aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmlmediaelement.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-07-08 09:56:31 -0700
committerGitHub <noreply@github.com>2016-07-08 09:56:31 -0700
commit12260b24d0e97ee33116d4b730203e5a2619a499 (patch)
tree15f0d085dfa1d6745885860f183607d6cb49a330 /components/script/dom/htmlmediaelement.rs
parentd475a277eebaa7d91d1b070b169e205b4c533c4f (diff)
parent55267560ca20b8e1ae1bb9173050611779673061 (diff)
downloadservo-12260b24d0e97ee33116d4b730203e5a2619a499.tar.gz
servo-12260b24d0e97ee33116d4b730203e5a2619a499.zip
Auto merge of #12277 - ConnorGBrewster:network_listener_cancellable, r=Manishearth
Make network listener runnable cancellable <!-- Please describe your changes on the following line: --> This keeps scripts from executing after its script thread has been shut down. --- <!-- 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 (maybe) #12048 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- 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="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12277) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmlmediaelement.rs')
-rw-r--r--components/script/dom/htmlmediaelement.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 7cfe19ba789..877a98311c4 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -473,10 +473,12 @@ impl HTMLMediaElement {
// 4.2
let context = Arc::new(Mutex::new(HTMLMediaElementContext::new(self, url.clone())));
let (action_sender, action_receiver) = ipc::channel().unwrap();
- let script_chan = window_from_node(self).networking_task_source();
+ let window = window_from_node(self);
+ let script_chan = window.networking_task_source();
let listener = box NetworkListener {
context: context,
script_chan: script_chan,
+ wrapper: Some(window.get_runnable_wrapper()),
};
let response_target = AsyncResponseTarget {