diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-09-15 05:30:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-15 05:30:47 -0500 |
commit | b2df99cb65a585907e59f70081c3b3c15317b11a (patch) | |
tree | b9eed7b94d34b0c48dba3fe55a9a896efe619e2f /components/layout/inline.rs | |
parent | 70a6b2fa91ed377ce5d0d1696bfb1503be8aa454 (diff) | |
parent | cedc7ebc53af6b31209095535ff8f04492661a86 (diff) | |
download | servo-b2df99cb65a585907e59f70081c3b3c15317b11a.tar.gz servo-b2df99cb65a585907e59f70081c3b3c15317b11a.zip |
Auto merge of #18462 - mrobinson:cleanup-building-state, r=emilio
Do some minor cleanups in display list building
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they should not change behavior.
<!-- 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/18462)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r-- | components/layout/inline.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index c38693c3340..e04ede22470 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -9,6 +9,7 @@ use app_units::{Au, MIN_AU}; use block::AbsoluteAssignBSizesTraversal; use context::LayoutContext; use display_list_builder::{DisplayListBuildState, InlineFlowDisplayListBuilding}; +use display_list_builder::StackingContextCollectionState; use euclid::{Point2D, Size2D}; use floats::{FloatKind, Floats, PlacementInfo}; use flow::{self, BaseFlow, Flow, FlowClass, ForceNonfloatedFlag}; @@ -1659,7 +1660,7 @@ impl Flow for InlineFlow { fn update_late_computed_block_position_if_necessary(&mut self, _: Au) {} - fn collect_stacking_contexts(&mut self, state: &mut DisplayListBuildState) { + fn collect_stacking_contexts(&mut self, state: &mut StackingContextCollectionState) { self.collect_stacking_contexts_for_inline(state); } |