Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 23:59:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18096 - glennw:update-wr-deinit, r=jdm

Browse source 
Update WR (new texture cache allocator, shader deinit path).

<!-- 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/18096)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-08-17 17:28:18 -05:00 • committed by GitHub
commit f6a42ed9c1
4 changed files with 52 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/compositing/compositor.rs
View file

@ -412,6 +412,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
compositor
}
pub fn deinit(self) {
self.webrender.deinit();
}
fn start_shutting_down(&mut self) {
debug!("Compositor sending Exit message to Constellation");
if let Err(e) = self.constellation_chan.send(ConstellationMsg::Exit) {
@ -1616,7 +1620,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
}
}
/// Why we performed a composite. This is used for debugging.
#[derive(Copy, Clone, PartialEq, Debug)]
pub enum CompositingReason {

4
components/servo/lib.rs
View file

@ -268,6 +268,10 @@ impl<Window> Servo<Window> where Window: WindowMethods + 'static {
Box::new(logger)
}).expect("Failed to set logger.")
}
pub fn deinit(self) {
self.compositor.deinit();
}
}
fn create_compositor_channel(event_loop_waker: Box<compositor_thread::EventLoopWaker>)