diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-08-29 19:15:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-29 19:15:59 -0500 |
commit | 7e363d60bb201a526eeebefbd57844cb1f070354 (patch) | |
tree | 6ea5f42b6da287dfea189c4b0118eede9b188bad /components/layout/flow.rs | |
parent | 473934c989c94773c38f585b1c4500cd8c811738 (diff) | |
parent | 9103743d0c55ef405599f3ea4170b6d1c5e4d00b (diff) | |
download | servo-7e363d60bb201a526eeebefbd57844cb1f070354.tar.gz servo-7e363d60bb201a526eeebefbd57844cb1f070354.zip |
Auto merge of #18175 - stshine:no-floats-in-flexbox, r=mbrubeck
layout: Stop call normal block size assignment for flex container
No need to call the `assign_block_size_block_base()` method of normal block in flex.rs since it is implemented for CSS2.
<!-- 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 #14813 (github issue number if applicable).
<!-- Either: -->
- [X] There are tests for these changes
<!-- 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/18175)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/flow.rs')
-rw-r--r-- | components/layout/flow.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 67976ed0a64..f4c545ec730 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -1279,9 +1279,7 @@ impl<'a> ImmutableFlowUtils for &'a Flow { return Some(base(kid).position.start.b + baseline_offset) } } - if kid.is_block_like() && - kid.as_block().formatting_context_type() == FormattingContextType::None && - !base(kid).flags.contains(IS_ABSOLUTELY_POSITIONED) { + if kid.is_block_like() && !base(kid).flags.contains(IS_ABSOLUTELY_POSITIONED) { if let Some(baseline_offset) = kid.baseline_offset_of_last_line_box_in_flow() { return Some(base(kid).position.start.b + baseline_offset) } |