Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pending pipelines to Frame instantly #12928

Closed
wants to merge 7 commits into from
Prev

remove pending pipelines from current frame tree

  • Loading branch information
cbrewster committed Sep 5, 2016
commit 5d15e5f1bbbf2f147df4ecfd58c68922536e155c
@@ -298,7 +298,13 @@ impl<'a> Iterator for FrameTreeIterator<'a> {
},
};
let pipeline = match self.pipelines.get(&frame.current.pipeline_id) {
Some(pipeline) => pipeline,
Some(pipeline) => {
// Pending pipelines are not included in the current frame tree
if pipeline.is_pending {
continue;
}
pipeline
},
None => {
warn!("Pipeline {:?} iterated after closure.", frame.current.pipeline_id);
continue;
@@ -2361,10 +2367,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
}

for frame in self.current_frame_tree_iter(self.root_frame_id) {
self.pipelines.get(&frame.current.pipeline_id).map(|pipeline| {
assert!(!pipeline.is_pending);
pipeline.grant_paint_permission()
});
self.pipelines.get(&frame.current.pipeline_id).map(|pipeline| pipeline.grant_paint_permission());
}
}

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.