Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-16 11:53:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7912 - eefriedman:compositor-layer, r=mrobinson

Browse source 
Make sure to correctly destroy old layers in collect_old_layers_for_pipeline.

The previous code would skip calling clear_all_tiles(), which led to a
panic in rust-layers. ("You should have disposed of the pixmap properly
with destroy()! This pixmap will leak!")

Ran into this messing around with pdf.js; no minimized testcase.
Maybe related to #7895.

r? @pcwalton

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7912)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-07 12:56:13 -06:00
commit 217c7da413
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/compositing/compositor_layer.rs
View file

@ -472,7 +472,9 @@ impl RcCompositorLayer for Rc<Layer<CompositorData>> {
}
// Keep this layer if it exists in the new layer list.
return new_layers.iter().any(|properties| properties.id == extra_data.id);
if new_layers.iter().any(|properties| properties.id == extra_data.id) {
return true
}
}
if let Some(ref subpage_info_for_this_layer) = extra_data.subpage_info {