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

[CSS] Fix wrong proximity calculation for implicit @scope #25918

Merged

Conversation

mdubet
Copy link
Contributor

@mdubet mdubet commented Mar 14, 2024

7b99ea4

[CSS] Fix wrong proximity calculation for implicit @scope
https://bugs.webkit.org/show_bug.cgi?id=270900
rdar://124640124

Reviewed by Antti Koivisto.

The previous code was wrongly trying to locate the distance
of the element to the @scope owner node (the <style> node),
while it should locate the distance to the parent of the owner node.

* LayoutTests/fast/css/scope-at-rule-expected.html:
* LayoutTests/fast/css/scope-at-rule.html:
* LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/scope-implicit-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/scope-implicit.html:
* Source/WebCore/style/ElementRuleCollector.cpp:
(WebCore::Style::ElementRuleCollector::scopeRulesMatch):

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

1eb3051

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 βœ… πŸ§ͺ api-wpe
βœ… πŸ§ͺ webkitpy βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ›  wpe-skia
⏳ πŸ›  πŸ§ͺ jsc βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ›  gtk
⏳ πŸ›  πŸ§ͺ jsc-arm64 βœ… πŸ›  tv ❌ πŸ§ͺ mac-AS-debug-wk2 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ§ͺ services βœ… πŸ›  tv-sim βœ… πŸ§ͺ mac-wk2-stress βœ… πŸ§ͺ api-gtk
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch βœ… πŸ›  jsc-armv7
βœ… πŸ›  watch-sim βœ… πŸ§ͺ jsc-armv7-tests

@mdubet mdubet self-assigned this Mar 14, 2024
@mdubet mdubet added the CSS Cascading Style Sheets implementation label Mar 14, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 15, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Mar 18, 2024
@mdubet mdubet force-pushed the css-scoping-implicit-cascade branch from 513e811 to 1eb3051 Compare March 18, 2024 20:41
@nt1m nt1m requested a review from anttijk March 18, 2024 20:59
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 19, 2024
@mdubet mdubet 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 19, 2024
https://bugs.webkit.org/show_bug.cgi?id=270900
rdar://124640124

Reviewed by Antti Koivisto.

The previous code was wrongly trying to locate the distance
of the element to the @scope owner node (the <style> node),
while it should locate the distance to the parent of the owner node.

* LayoutTests/fast/css/scope-at-rule-expected.html:
* LayoutTests/fast/css/scope-at-rule.html:
* LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/scope-implicit-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/scope-implicit.html:
* Source/WebCore/style/ElementRuleCollector.cpp:
(WebCore::Style::ElementRuleCollector::scopeRulesMatch):

Canonical link: https://commits.webkit.org/276345@main
@webkit-commit-queue
Copy link
Collaborator

Committed 276345@main (7b99ea4): https://commits.webkit.org/276345@main

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

@webkit-commit-queue webkit-commit-queue merged commit 7b99ea4 into WebKit:main Mar 19, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Mar 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CSS Cascading Style Sheets implementation
Projects
None yet
5 participants