Skip to content

Commit

Permalink
Auto merge of #18725 - mrobinson:tick-animation-display-list, r=jdm
Browse files Browse the repository at this point in the history
TickAnimations should create a display list

This is a regression from the removal of ReflowQueryType.

Fixes #18701.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #18701  (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because this should fix tests currently failing on the build infrastructure, but the failures seem to be very timing dependent.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18725)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Oct 3, 2017
2 parents 31cef8c + 7920ff7 commit e07c6f3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions components/script_layout_interface/message.rs
Expand Up @@ -126,12 +126,13 @@ impl ReflowGoal {
pub fn needs_display_list(&self) -> bool {
match *self {
ReflowGoal::NodesFromPoint(..) | ReflowGoal::HitTestQuery(..) |
ReflowGoal::TextIndexQuery(..) | ReflowGoal::Full => true,
ReflowGoal::TextIndexQuery(..) | ReflowGoal::TickAnimations |
ReflowGoal::Full => true,
ReflowGoal::ContentBoxQuery(_) | ReflowGoal::ContentBoxesQuery(_) |
ReflowGoal::NodeGeometryQuery(_) | ReflowGoal::NodeScrollGeometryQuery(_) |
ReflowGoal::NodeOverflowQuery(_) | ReflowGoal::NodeScrollRootIdQuery(_) |
ReflowGoal::ResolvedStyleQuery(..) | ReflowGoal::OffsetParentQuery(_) |
ReflowGoal::MarginStyleQuery(_) | ReflowGoal::TickAnimations => false,
ReflowGoal::MarginStyleQuery(_) => false,
}
}

Expand Down

0 comments on commit e07c6f3

Please sign in to comment.