Skip to content

[LFC][IFC][shape-outside] Use constraints to adjust line after placing a float #11286

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Mar 9, 2023
Merged

[LFC][IFC][shape-outside] Use constraints to adjust line after placing a float #11286

merged 1 commit into from
Mar 9, 2023

Conversation

@anttijk
Copy link
Contributor

@anttijk anttijk commented Mar 9, 2023 •
edited by webkit-early-warning-system
Loading

bb2e9b7

[LFC][IFC][shape-outside] Use constraints to adjust line after placing a float
https://bugs.webkit.org/show_bug.cgi?id=253633
rdar://106485706

Reviewed by Alan Baradlay.

* Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp:
(WebCore::Layout::LineBuilder::tryPlacingFloatBox):

Use the constraints for post-placement line adjustments so we can take shapes into account.

Canonical link: https://commits.webkit.org/261430@main

9a27d07

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2
✅ 🧪 webkitperl   🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
  🧪 api-ios ❌ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🛠 tv ✅ 🧪 mac-wk2   🧪 api-gtk
✅ 🛠 tv-sim   🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge ✅ 🛠 watch-sim

@anttijk anttijk self-assigned this Mar 9, 2023
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Mar 9, 2023 •
edited
Loading

EWS run on current version of this PR (hash 9a27d07)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2
✅ 🧪 webkitperl   🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
  🧪 api-ios ❌ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🛠 tv ✅ 🧪 mac-wk2   🧪 api-gtk
✅ 🛠 tv-sim   🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge ✅ 🛠 watch-sim

@anttijk anttijk added the Layout and Rendering For bugs with layout and rendering of Web pages. label Mar 9, 2023
alanbaradlay
alanbaradlay approved these changes Mar 9, 2023
View reviewed changes
Copy link
Contributor

@alanbaradlay alanbaradlay left a comment

Choose a reason for hiding this comment

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

nice

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 9, 2023
@anttijk anttijk added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Mar 9, 2023
@anttijk
[LFC][IFC][shape-outside] Use constraints to adjust line after placin…
bb2e9b7 
…g a float

https://bugs.webkit.org/show_bug.cgi?id=253633
rdar://106485706

Reviewed by Alan Baradlay.

* Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp:
(WebCore::Layout::LineBuilder::tryPlacingFloatBox):

Use the constraints for post-placement line adjustments so we can take shapes into account.

Canonical link: https://commits.webkit.org/261430@main
@webkit-commit-queue webkit-commit-queue force-pushed the ifc-float-placement-constraint branch from 9a27d07 to bb2e9b7 Compare March 9, 2023 15:14
@webkit-commit-queue
Copy link
Collaborator

Committed 261430@main (bb2e9b7): https://commits.webkit.org/261430@main

Reviewed commits have been landed. Closing PR #11286 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit bb2e9b7 into WebKit:main Mar 9, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Mar 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alanbaradlay alanbaradlay alanbaradlay approved these changes

Assignees

@anttijk anttijk

Labels

Layout and Rendering For bugs with layout and rendering of Web pages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@anttijk @webkit-early-warning-system @webkit-commit-queue @alanbaradlay @webkit-ews-buildbot