auto merge of #2252 : mbrubeck/servo/1778-borrow-layer, r=larsbergstrom

Fixes a crash in ContainerLayer::remove_child (#1778). r? @larsbergstrom
This commit is contained in:
bors-servo 2014-04-28 18:07:38 -04:00
commit afae6a3c71

View file

@ -376,10 +376,11 @@ impl IOCompositor {
self.opts.tile_size, self.opts.tile_size,
self.opts.cpu_painting); self.opts.cpu_painting);
match *self.root_layer.first_child.borrow() { let first_child = self.root_layer.first_child.borrow().clone();
match first_child {
None => {} None => {}
Some(ref old_layer) => { Some(old_layer) => {
ContainerLayer::remove_child(self.root_layer.clone(), old_layer.clone()) ContainerLayer::remove_child(self.root_layer.clone(), old_layer)
} }
} }