Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix intrinsic sizing of block container containing a BFC root after floats #30012

Merged

Conversation

Loirooriol
Copy link
Contributor

A block that establishes an independent formatting context is placed
next to previous floats, so we should add their sizes when computing
the intrinsic contribution of the parent block container.


@Loirooriol
Copy link
Contributor Author

@bors-servo try=wpt-2020

@bors-servo
Copy link
Contributor

⌛ Trying commit 1f4459c with merge 344d0af...

bors-servo added a commit that referenced this pull request Jul 19, 2023
…ts, r=<try>

Fix intrinsic sizing of block container containing a BFC root after floats

A block that establishes an independent formatting context is placed
next to previous floats, so we should add their sizes when computing
the intrinsic contribution of the parent block container.

---
<!-- 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 #30011
- [X] These changes do not require tests because the spec says "CSS 2 does not define the exact algorithm".
<!-- 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. -->
@Loirooriol
Copy link
Contributor Author

I had a full testcase at home that I can check when I get back, but I think this matches what other browser do.

@github-actions
Copy link

Test results for linux-wpt-layout-2020 from try job (#5595526567):

Flaky unexpected result (2)
  • OK /_mozilla/mozilla/task_queue_throttling.any.html (#22519)
    • FAIL [expected PASS] subtest: Throttling the performance timeline task queue. assert_true: expected true got false
  • TIMEOUT [expected PASS] /css/css-color/animation/opacity-animation-ending-correctly-002.html (#29216)
Stable unexpected results that are known to be intermittent (1)
  • PASS [expected FAIL] /css/css-flexbox/flexbox_fbfc.html (#28693)

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably 9c333ab) made this pull request unmergeable. Please resolve the merge conflicts.

…loats

A block that establishes an independent formatting context is placed
next to previous floats, so we should add their sizes when computing
the intrinsic contribution of the parent block container.
@Loirooriol Loirooriol force-pushed the fix-intrinsic-sizing-bfc-after-floats branch from 1f4459c to 9e67a67 Compare July 19, 2023 14:35
@Loirooriol
Copy link
Contributor Author

@bors-servo try=wpt-2020

@bors-servo
Copy link
Contributor

⌛ Trying commit 9e67a67 with merge 4a0efb5...

bors-servo added a commit that referenced this pull request Jul 19, 2023
…ts, r=<try>

Fix intrinsic sizing of block container containing a BFC root after floats

A block that establishes an independent formatting context is placed
next to previous floats, so we should add their sizes when computing
the intrinsic contribution of the parent block container.

---
<!-- 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 #30011
- [X] These changes do not require tests because the spec says "CSS 2 does not define the exact algorithm".
<!-- 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. -->
@github-actions
Copy link

Test results for linux-wpt-layout-2020 from try job (#5600521128):

Flaky unexpected result (1)
  • OK /_mozilla/mozilla/task_queue_throttling.any.html (#22519)
    • FAIL [expected PASS] subtest: Throttling the performance timeline task queue. assert_true: expected true got false
Stable unexpected results that are known to be intermittent (1)
  • PASS [expected FAIL] /css/css-flexbox/flexbox_fbfc.html (#28693)

@mrobinson mrobinson added this pull request to the merge queue Jul 19, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 19, 2023
@Loirooriol Loirooriol added this pull request to the merge queue Jul 19, 2023
Merged via the queue into servo:master with commit 727d61a Jul 19, 2023
9 of 10 checks passed
@Loirooriol Loirooriol deleted the fix-intrinsic-sizing-bfc-after-floats branch July 19, 2023 19:26
@bors-servo
Copy link
Contributor

💥 Test timed out

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

calculate_inline_content_size_for_block_level_boxes should handle independent formatting contexts after floats
3 participants