Skip to content

Support margin-trim: block inline keyword combination#44515

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
nt1m:eng/Support-margin-trim-block-inline-keyword-combination
Apr 28, 2025
Merged

Support margin-trim: block inline keyword combination#44515
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
nt1m:eng/Support-margin-trim-block-inline-keyword-combination

Conversation

@nt1m
Copy link
Member

@nt1m nt1m commented Apr 25, 2025 •
edited by webkit-early-warning-system
Loading

598304c

Support `margin-trim: block inline` keyword combination
https://bugs.webkit.org/show_bug.cgi?id=284978
rdar://141784069

Reviewed by Sammy Gill.

Add parsing/serialization support for this combination as specified in: https://www.w3.org/TR/css-box-4/#margin-trim

* LayoutTests/imported/w3c/web-platform-tests/css/css-box/parsing/margin-trim-computed-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-box/parsing/margin-trim-computed.html:
* LayoutTests/imported/w3c/web-platform-tests/css/css-box/parsing/margin-trim-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-box/parsing/margin-trim.html:
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/css/ComputedStyleExtractor.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle const):
* Source/WebCore/css/parser/CSSPropertyParserConsumer+Box.cpp:
(WebCore::CSSPropertyParserHelpers::consumeMarginTrim):
* Source/WebCore/style/StyleBuilderConverter.h:
(WebCore::Style::BuilderConverter::convertMarginTrim):

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

3113499

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@nt1m nt1m self-assigned this Apr 25, 2025
@nt1m nt1m added the New Bugs Unclassified bugs are placed in this component until the correct component can be determined. label Apr 25, 2025
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Apr 25, 2025 •
edited
Loading

EWS run on previous version of this PR (hash de11556)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ❌ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ✅ 🛠 playstation
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

sammygill
sammygill reviewed Apr 25, 2025
View reviewed changes
weinig
weinig requested changes Apr 25, 2025
View reviewed changes
@nt1m nt1m force-pushed the eng/Support-margin-trim-block-inline-keyword-combination branch from de11556 to 2f25de5 Compare April 25, 2025 20:28
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Apr 25, 2025 •
edited
Loading

EWS run on previous version of this PR (hash 2f25de5)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ❌ 🛠 ios ❌ 🛠 mac ❌ 🛠 wpe   🛠 win
✅ 🧪 bindings ❌ 🛠 ios-sim ❌ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2   🧪 win-tests
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ❌ 🧪 api-mac ❌ 🧪 api-wpe
❌ 🧪 ios-wk2-wpt ❌ 🧪 mac-wk1 ❌ 🛠 wpe-cairo
❌ 🧪 api-ios ❌ 🧪 mac-wk2   🛠 gtk
❌ 🛠 vision ❌ 🧪 mac-AS-debug-wk2   🧪 gtk-wk2
❌ 🛠 vision-sim ❌ 🧪 mac-wk2-stress   🧪 api-gtk
⏳ 🧪 vision-wk2 ❌ 🧪 mac-intel-wk2   🛠 playstation
❌ 🛠 tv ❌ 🛠 mac-safer-cpp
❌ 🛠 tv-sim
❌ 🛠 watch
❌ 🛠 watch-sim

@nt1m nt1m force-pushed the eng/Support-margin-trim-block-inline-keyword-combination branch from 2f25de5 to 3113499 Compare April 25, 2025 20:52
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Apr 25, 2025 •
edited
Loading

EWS run on current version of this PR (hash 3113499)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@nt1m nt1m requested review from sammygill and weinig April 25, 2025 20:53
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 25, 2025
@nt1m nt1m removed the merging-blocked Applied to prevent a change from being merged label Apr 27, 2025
@nt1m nt1m added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Apr 28, 2025
@nt1m
Support margin-trim: block inline keyword combination
598304c 
https://bugs.webkit.org/show_bug.cgi?id=284978
rdar://141784069

Reviewed by Sammy Gill.

Add parsing/serialization support for this combination as specified in: https://www.w3.org/TR/css-box-4/#margin-trim

* LayoutTests/imported/w3c/web-platform-tests/css/css-box/parsing/margin-trim-computed-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-box/parsing/margin-trim-computed.html:
* LayoutTests/imported/w3c/web-platform-tests/css/css-box/parsing/margin-trim-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-box/parsing/margin-trim.html:
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/css/ComputedStyleExtractor.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle const):
* Source/WebCore/css/parser/CSSPropertyParserConsumer+Box.cpp:
(WebCore::CSSPropertyParserHelpers::consumeMarginTrim):
* Source/WebCore/style/StyleBuilderConverter.h:
(WebCore::Style::BuilderConverter::convertMarginTrim):

Canonical link: https://commits.webkit.org/294190@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Support-margin-trim-block-inline-keyword-combination branch from 3113499 to 598304c Compare April 28, 2025 14:32
@webkit-commit-queue
Copy link
Collaborator

webkit-commit-queue commented Apr 28, 2025

Committed 294190@main (598304c): https://commits.webkit.org/294190@main

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

@webkit-commit-queue webkit-commit-queue merged commit 598304c into WebKit:main Apr 28, 2025
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Apr 28, 2025
@nt1m nt1m deleted the eng/Support-margin-trim-block-inline-keyword-combination branch May 16, 2025 01:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sammygill sammygill sammygill approved these changes

@anttijk anttijk Awaiting requested review from anttijk

@darinadler darinadler Awaiting requested review from darinadler

@weinig weinig Awaiting requested review from weinig

Assignees

@nt1m nt1m

Labels

New Bugs Unclassified bugs are placed in this component until the correct component can be determined.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@nt1m @webkit-early-warning-system @webkit-commit-queue @weinig @sammygill @webkit-ews-buildbot