diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-04-28 18:07:38 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-04-28 18:07:38 -0400 |
| commit | afae6a3c71a722258e204ba51551a2a6143920d5 (patch) | |
| tree | 7e4ebd48a208ba38a4b7a66bb0d4984988283c22 /src | |
| parent | 77d9f7294799459b126e61b2dc0b0b27b74a6ba7 (diff) | |
| parent | c4f5ffb1142c6f35135ca1605265b03aa385937c (diff) | |
| download | servo-afae6a3c71a722258e204ba51551a2a6143920d5.tar.gz servo-afae6a3c71a722258e204ba51551a2a6143920d5.zip | |
auto merge of #2252 : mbrubeck/servo/1778-borrow-layer, r=larsbergstrom
Fixes a crash in ContainerLayer::remove_child (#1778). r? @larsbergstrom
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/main/compositing/compositor.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/main/compositing/compositor.rs b/src/components/main/compositing/compositor.rs index 111816d26b9..601bfcfedab 100644 --- a/src/components/main/compositing/compositor.rs +++ b/src/components/main/compositing/compositor.rs @@ -376,10 +376,11 @@ impl IOCompositor { self.opts.tile_size, 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 => {} - Some(ref old_layer) => { - ContainerLayer::remove_child(self.root_layer.clone(), old_layer.clone()) + Some(old_layer) => { + ContainerLayer::remove_child(self.root_layer.clone(), old_layer) } } |