Auto merge of #29945 - Loirooriol:fix-float-placement-with-future-margins-2, r=mrobinson

Properly position floats when subsequent boxes collapse margins with containing block (2)

PR #29939 tried to address this but missed various cases.

<!-- 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 #29944
- [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. -->
This commit is contained in:
bors-servo 2023-06-30 02:28:37 +02:00 committed by GitHub
commit 7412e28349
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 57 deletions

View file

@ -0,0 +1,2 @@
[adjoining-float-nested-forced-clearance-002.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[clear-on-parent-with-margins-no-clearance.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[margin-collapse-157.xht]
expected: FAIL

View file

@ -1,2 +0,0 @@
[margin-collapse-clear-015.xht]
expected: FAIL

View file

@ -1,2 +0,0 @@
[margin-collapse-039.xht]
expected: FAIL

View file

@ -1,2 +0,0 @@
[margin-collapse-041.xht]
expected: FAIL