Skip to content

Conversation

@servo-wpt-sync
Copy link
Collaborator

Phantom line boxes allow margins to collapse through them. But in the sequential layout state we were assuming that was not the case, so we were placing floats incorrectly.

Testing: Adding 2 tests
Fixes: #41794
Fixes: #41734

Reviewed in servo/servo#41812

Copy link
Collaborator

@wpt-pr-bot wpt-pr-bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The review process for this patch is being conducted in the Servo project.

Phantom line boxes allow margins to collapse through them. But in the
sequential layout state we were assuming that was not the case, so we
were placing floats incorrectly.

Signed-off-by: Oriol Brufau <[email protected]>
@servo-wpt-sync servo-wpt-sync added stale-servo-export PRs that were supposed to merge but were not able to do so. and removed do not merge yet labels Jan 13, 2026
@servo-wpt-sync
Copy link
Collaborator Author

⛔ The downstream PR has merged (servo/servo#41812), but these changes could not be merged properly. Please address any CI issues and try to merge manually.

@Loirooriol Loirooriol enabled auto-merge (rebase) January 13, 2026 23:48
@Loirooriol Loirooriol closed this Jan 13, 2026
auto-merge was automatically disabled January 13, 2026 23:57

Pull request was closed

@Loirooriol Loirooriol reopened this Jan 13, 2026
@Loirooriol Loirooriol enabled auto-merge (rebase) January 14, 2026 00:00
@Loirooriol Loirooriol force-pushed the servo_export_41812 branch 2 times, most recently from ac19357 to 585dd5b Compare January 14, 2026 00:03
@Loirooriol
Copy link
Contributor

Loirooriol commented Jan 14, 2026

I don't know why d6e32d4 seems stuck checking mergeability, but it's just a rebased 585dd5b, so let's see if that one lands when CI checks finish.

@Loirooriol Loirooriol merged commit 1053d9a into web-platform-tests:master Jan 14, 2026
35 checks passed
@Loirooriol Loirooriol deleted the servo_export_41812 branch January 14, 2026 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CSS2 servo-export stale-servo-export PRs that were supposed to merge but were not able to do so. wg-css

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants