diff options
author | bors-servo <infra@servo.org> | 2023-06-16 20:03:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-16 20:03:36 +0200 |
commit | 47fb54fc54894416de8c2582db7ca2f73ea5f93b (patch) | |
tree | 5801a39554b57f1a0941fff43437c064a20d3e14 /components/layout_2020/flow/mod.rs | |
parent | 0b310e6e6a5fdfcede859d14974dd7f368ec405b (diff) | |
parent | 66c4eee0821ebaf0fdce92b19a80cc3b80bb4fd0 (diff) | |
download | servo-47fb54fc54894416de8c2582db7ca2f73ea5f93b.tar.gz servo-47fb54fc54894416de8c2582db7ca2f73ea5f93b.zip |
Auto merge of #29883 - Loirooriol:float-inline-size, r=mrobinson
Implement BlockLevelBox::inline_content_sizes for floats
This improves #29874, but `BlockContainer::inline_content_sizes` will still need more changes in order to correctly handle sequences of floats.
<!-- 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: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because ___
<!-- 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. -->
Diffstat (limited to 'components/layout_2020/flow/mod.rs')
-rw-r--r-- | components/layout_2020/flow/mod.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs index 4101c33606b..5837e836d88 100644 --- a/components/layout_2020/flow/mod.rs +++ b/components/layout_2020/flow/mod.rs @@ -388,10 +388,9 @@ impl BlockLevelBox { Self::Independent(independent) => independent .outer_inline_content_sizes(layout_context, containing_block_writing_mode), BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(_) => ContentSizes::zero(), - BlockLevelBox::OutOfFlowFloatBox(_box_) => { - // TODO: Actually implement that. - ContentSizes::zero() - }, + BlockLevelBox::OutOfFlowFloatBox(float_box) => float_box + .contents + .outer_inline_content_sizes(layout_context, containing_block_writing_mode), } } } |