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

Auto merge of #6863 - pcwalton:null-layer-id, r=glennw

Browse source 
compositing: Don't count the root layer when checking to see when to take the screenshot.

 … as it isn't painted after first layout comes in.

r? @glennw

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6863)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-30 23:58:05 -06:00
commit 1fc50c6ccf
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/compositing/compositor.rs
View file

@ -1324,7 +1324,12 @@ impl<Window: WindowMethods> IOCompositor<Window> {
// have not requested a paint of the current epoch. // have not requested a paint of the current epoch.
// If a layer has sent a request for the current epoch, but it hasn't // If a layer has sent a request for the current epoch, but it hasn't
// arrived yet then this layer is waiting for a paint message. // arrived yet then this layer is waiting for a paint message.
if layer_data.requested_epoch == current_epoch && layer_data.painted_epoch != current_epoch { //
// Also don't check the root layer, because the paint task won't paint
// anything for it after first layout.
if layer_data.id != LayerId::null() &&
layer_data.requested_epoch == current_epoch &&
layer_data.painted_epoch != current_epoch {
return true; return true;
} }