diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-20 14:23:30 -0700 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-20 14:23:30 -0700 |
commit | 85d8267fd249c1929057cd66cd573c1f7ed4871d (patch) | |
tree | 93d6be09ddd33852ddfadf695f8352b87bbb44e0 | |
parent | 5b9375ada11fa53a7fd4a23afd05750b852831f0 (diff) | |
parent | 4f623dead3a944a546b54198496ba955c4233fda (diff) | |
download | servo-85d8267fd249c1929057cd66cd573c1f7ed4871d.tar.gz servo-85d8267fd249c1929057cd66cd573c1f7ed4871d.zip |
Auto merge of #11299 - servo:GlutinCompositorProxy-Send, r=nox
Remove unsafe Send implementation for GlutinCompositorProxy.
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 --faster` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
Either:
- [ ] There are tests for these changes OR
- [x] 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.
Send is now implemented for glutin::WindowProxy.
<!-- 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/11299)
<!-- Reviewable:end -->
-rw-r--r-- | ports/glutin/window.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 8197767d635..c74a1adb6a2 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -845,9 +845,6 @@ struct GlutinCompositorProxy { window_proxy: Option<glutin::WindowProxy>, } -// TODO: Should this be implemented here or upstream in glutin::WindowProxy? -unsafe impl Send for GlutinCompositorProxy {} - impl CompositorProxy for GlutinCompositorProxy { fn send(&self, msg: compositor_thread::Msg) { // Send a message and kick the OS event loop awake. |