Skip to content

Commit

Permalink
Auto merge of #703 - jrmuizel:root-pipeline2, r=kvark
Browse files Browse the repository at this point in the history
Avoid frame notification when root pipeline doesn't exist

If we don't have a pipeline to draw don't try to draw it.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/703)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored Jan 11, 2017
2 parents 7b7f44f + 20c9292 commit ee79fc9
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions webrender/src/render_backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,13 @@ impl RenderBackend {
}
}
ApiMsg::SetRootPipeline(pipeline_id) => {
let frame = profile_counters.total_time.profile(|| {
self.scene.set_root_pipeline_id(pipeline_id);
self.scene.set_root_pipeline_id(pipeline_id);

if self.scene.display_lists.get(&pipeline_id).is_none() {
continue;
}

let frame = profile_counters.total_time.profile(|| {
self.build_scene();
self.render()
});
Expand Down

0 comments on commit ee79fc9

Please sign in to comment.