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

auto merge of #2602 : mbrubeck/servo/revert-root-pipeline-check, r=pcwalton

Browse source 
This reverts 2b0134be7b because it was not correct for iframes.  Oops.  (Wasn't caught by tests because we still have other crashes preventing iframe testing.)  r? @pcwalton.
This commit is contained in:
bors-servo 2014-06-07 02:46:21 -04:00
commit 1184b500e5
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/main/compositing/compositor.rs
View file

@ -359,7 +359,7 @@ impl IOCompositor {
} }
_ => { _ => {
match self.root_pipeline { match self.root_pipeline {
Some(ref root_pipeline) if root_pipeline.id == id => { Some(ref root_pipeline) => {
(root_pipeline.clone(), LayerId::null()) (root_pipeline.clone(), LayerId::null())
}, },
_ => fail!("Compositor: Received new layer without initialized pipeline"), _ => fail!("Compositor: Received new layer without initialized pipeline"),