diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-06-07 02:46:21 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-06-07 02:46:21 -0400 |
| commit | 1184b500e50123fdcfb6824bed1df6e770b0d0f8 (patch) | |
| tree | 0bedee630307ff87d28357533f75abded03e54d4 | |
| parent | f1194fc85bfb857962684eccd352968b3ace7d84 (diff) | |
| parent | a226086a32d2d843fad442127e400e923ae35ec0 (diff) | |
| download | servo-1184b500e50123fdcfb6824bed1df6e770b0d0f8.tar.gz servo-1184b500e50123fdcfb6824bed1df6e770b0d0f8.zip | |
auto merge of #2602 : mbrubeck/servo/revert-root-pipeline-check, r=pcwalton
This reverts 2b0134be7bb8a4372f1a8703b5a1b114e65351f6 because it was not correct for iframes. Oops. (Wasn't caught by tests because we still have other crashes preventing iframe testing.) r? @pcwalton.
| -rw-r--r-- | src/components/main/compositing/compositor.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/main/compositing/compositor.rs b/src/components/main/compositing/compositor.rs index 006653027c3..03d6e600ba1 100644 --- a/src/components/main/compositing/compositor.rs +++ b/src/components/main/compositing/compositor.rs @@ -359,7 +359,7 @@ impl IOCompositor { } _ => { match self.root_pipeline { - Some(ref root_pipeline) if root_pipeline.id == id => { + Some(ref root_pipeline) => { (root_pipeline.clone(), LayerId::null()) }, _ => fail!("Compositor: Received new layer without initialized pipeline"), |