Skip to content

Commit

Permalink
Auto merge of #23883 - servo:jdm-patch-45, r=asajeffrey
Browse files Browse the repository at this point in the history
Drop webgl main thread data during shutdown.

Before this change I get a panic late in shutdown because we end up trying to communicate with webrender during TLS teardown.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because no tests on windows.

<!-- 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/23883)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Jul 29, 2019
2 parents 447ae1e + 25b20eb commit 7a570a7
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions components/canvas/webgl_thread.rs
Expand Up @@ -112,12 +112,14 @@ impl WebGLMainThread {

// Any context could be current when we start.
self.thread_data.borrow_mut().bound_context_id = None;
self.shut_down.set(
!self
.thread_data
.borrow_mut()
.process(EventLoop::Nonblocking),
);
let result = self
.thread_data
.borrow_mut()
.process(EventLoop::Nonblocking);
if !result {
self.shut_down.set(true);
WEBGL_MAIN_THREAD.with(|thread_data| thread_data.borrow_mut().take());
}
}

/// Returns the main GL thread if called from the main thread,
Expand Down

0 comments on commit 7a570a7

Please sign in to comment.