:has(~:dir(~)) should work #3801

rniwa · 2022-08-30T13:41:45Z

`ded49fa`

:has(~:dir(~)) should work
https://bugs.webkit.org/show_bug.cgi?id=243093

Reviewed by Antti Koivisto.

Implement :dir pseudo class invalidation. This patch introduces the notion of effective text direction
which is stored in Node's rareDataBitfields. To signify whether this is used for text direction or not,
another boolean value usesEffectiveTextDirection has been added to rareDataBitfields.

Like https://commits.webkit.org/253764@main for :lang, this patch has an optimization to avoid using
rareDataBitfields when the text direction matches that of the document element.

* LayoutTests/TestExpectations: Removed image only failures from tests that are now passing.
* LayoutTests/fast/css/dir-pseudo-container-query-expected.html: Added.
* LayoutTests/fast/css/dir-pseudo-container-query-invalidation-expected.html: Added.
* LayoutTests/fast/css/dir-pseudo-container-query-invalidation.html: Added.
* LayoutTests/fast/css/dir-pseudo-container-query.html: Added.
* LayoutTests/platform/win/TestExpectations: Skip the newly added tests since :dir isn't enabled yet.

* Source/WebCore/css/SelectorCheckerTestFunctions.h
(WebCore::matchesDirPseudoClass): Now uses effectiveTextDirection instead of computeDirectionality.

* Source/WebCore/dom/Document.cpp:
(WebCore::Document::childrenChanged): Calls setDocumentElementTextDirection. Note we need to explicitly
check usesEffectiveTextDirection since effectiveTextDirection falls back to documentElementTextDirection.

* Source/WebCore/dom/Document.h:
(WebCore::Document::documentElementTextDirection const): Added.
(WebCore::Document::setDocumentElementTextDirection): Added.

* Source/WebCore/dom/Node.cpp:
(WebCore::Node::incrementConnectedSubframeCount):
(WebCore::Node::effectiveTextDirection const): Added.
(WebCore::Node::setEffectiveTextDirection): Added.
(WebCore::Node::setUsesEffectiveTextDirection): Added.

* Source/WebCore/dom/Node.h:
(WebCore::Node::usesEffectiveTextDirection const): Added.

* Source/WebCore/html/HTMLElement.cpp:
(WebCore::TextDirectionDirective): Added.
(WebCore::parseTextDirection): Added.
(WebCore::isValidDirValue): Now uses parseTextDirection.
(WebCore::elementAffectsDirectionality): Moved up to be used in insertedIntoAncestor.
(WebCore::HTMLElement::insertedIntoAncestor): Inherit the effective text direction from parent unless
this is an input type=telephone.
(WebCore::HTMLElement::removedFromAncestor): Added. Clear the inherited effective text direction.
(WebCore::HTMLElement::computeDirectionality const): Removed.
(WebCore::HTMLElement::dirAttributeChanged): Added the invalidation logic for each value type. Notably,
when the new value is invalid, we inherit from the parent node unless this is an input type=telephone.
(WebCore::HTMLElement::updateEffectiveDirectionality): Added. Implements the recursive invalidation
for :dir pseudo class.
(WebCore::HTMLElement::adjustDirectionalityIfNeededAfterChildAttributeChanged): Update the effective
text direction instead of simply invalidating the style.
(WebCore::HTMLElement::updateEffectiveDirectionalityOfDirAuto): Ditto.
(WebCore::HTMLElement::adjustDirectionalityIfNeededAfterChildrenChanged):

* Source/WebCore/html/HTMLElement.h:

* Source/WebCore/html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::subtreeHasChanged): Don't call updateEffectiveDirectionalityOfDirAuto
if this element hasn't been marked with selfOrPrecedingNodesAffectDirAuto. Otherwise, we'd set
selfOrPrecedingNodesAffectDirAuto on input element without dir=auto. This was caught by new assertions.
(WebCore::HTMLInputElement::setValue): Added a call to updateEffectiveDirectionalityOfDirAuto when
selfOrPrecedingNodesAffectDirAuto is set. This is needed now that the effective text direction is cached
as opposed to re-computed each time in computeDirectionality.

* Source/WebCore/html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::subtreeHasChanged): Same as HTMLInputElement.
(WebCore::HTMLTextAreaElement::setValueCommon): Ditto.

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

760a9df

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

webkit-early-warning-system · 2022-08-30T13:45:24Z

EWS run on previous version of this PR (hash 3b4bd1a)

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

webkit-early-warning-system · 2022-08-30T22:06:06Z

EWS run on previous version of this PR (hash 3f4a1ca)

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

webkit-early-warning-system · 2022-08-30T23:07:14Z

EWS run on previous version of this PR (hash 3dd613d)

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

webkit-early-warning-system · 2022-08-31T02:22:13Z

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

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

webkit-early-warning-system · 2022-08-31T05:12:48Z

EWS run on previous version of this PR (hash 390f61e)

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

webkit-early-warning-system · 2022-08-31T06:05:27Z

EWS run on previous version of this PR (hash 7dae483)

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

anttijk · 2022-08-31T11:14:26Z

LayoutTests/TestExpectations

 webkit.org/b/64861 imported/w3c/web-platform-tests/css/selectors/dir-style-01a.html [ ImageOnlyFailure ]
 webkit.org/b/64861 imported/w3c/web-platform-tests/css/selectors/dir-style-01b.html [ ImageOnlyFailure ]


wonder what is still wrong with these?

It's anti-aliasing issue. See #3842

webkit-commit-queue · 2022-08-31T17:07:18Z

No reviewer information in commit message, blocking PR #3801

webkit-early-warning-system · 2022-08-31T17:21:05Z

760a9df

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

https://bugs.webkit.org/show_bug.cgi?id=243093 Reviewed by Antti Koivisto. Implement :dir pseudo class invalidation. This patch introduces the notion of effective text direction which is stored in Node's rareDataBitfields. To signify whether this is used for text direction or not, another boolean value usesEffectiveTextDirection has been added to rareDataBitfields. Like https://commits.webkit.org/253764@main for :lang, this patch has an optimization to avoid using rareDataBitfields when the text direction matches that of the document element. * LayoutTests/TestExpectations: Removed image only failures from tests that are now passing. * LayoutTests/fast/css/dir-pseudo-container-query-expected.html: Added. * LayoutTests/fast/css/dir-pseudo-container-query-invalidation-expected.html: Added. * LayoutTests/fast/css/dir-pseudo-container-query-invalidation.html: Added. * LayoutTests/fast/css/dir-pseudo-container-query.html: Added. * LayoutTests/platform/win/TestExpectations: Skip the newly added tests since :dir isn't enabled yet. * Source/WebCore/css/SelectorCheckerTestFunctions.h (WebCore::matchesDirPseudoClass): Now uses effectiveTextDirection instead of computeDirectionality. * Source/WebCore/dom/Document.cpp: (WebCore::Document::childrenChanged): Calls setDocumentElementTextDirection. Note we need to explicitly check usesEffectiveTextDirection since effectiveTextDirection falls back to documentElementTextDirection. * Source/WebCore/dom/Document.h: (WebCore::Document::documentElementTextDirection const): Added. (WebCore::Document::setDocumentElementTextDirection): Added. * Source/WebCore/dom/Node.cpp: (WebCore::Node::incrementConnectedSubframeCount): (WebCore::Node::effectiveTextDirection const): Added. (WebCore::Node::setEffectiveTextDirection): Added. (WebCore::Node::setUsesEffectiveTextDirection): Added. * Source/WebCore/dom/Node.h: (WebCore::Node::usesEffectiveTextDirection const): Added. * Source/WebCore/html/HTMLElement.cpp: (WebCore::TextDirectionDirective): Added. (WebCore::parseTextDirection): Added. (WebCore::isValidDirValue): Now uses parseTextDirection. (WebCore::elementAffectsDirectionality): Moved up to be used in insertedIntoAncestor. (WebCore::HTMLElement::insertedIntoAncestor): Inherit the effective text direction from parent unless this is an input type=telephone. (WebCore::HTMLElement::removedFromAncestor): Added. Clear the inherited effective text direction. (WebCore::HTMLElement::computeDirectionality const): Removed. (WebCore::HTMLElement::dirAttributeChanged): Added the invalidation logic for each value type. Notably, when the new value is invalid, we inherit from the parent node unless this is an input type=telephone. (WebCore::HTMLElement::updateEffectiveDirectionality): Added. Implements the recursive invalidation for :dir pseudo class. (WebCore::HTMLElement::adjustDirectionalityIfNeededAfterChildAttributeChanged): Update the effective text direction instead of simply invalidating the style. (WebCore::HTMLElement::updateEffectiveDirectionalityOfDirAuto): Ditto. (WebCore::HTMLElement::adjustDirectionalityIfNeededAfterChildrenChanged): * Source/WebCore/html/HTMLElement.h: * Source/WebCore/html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::subtreeHasChanged): Don't call updateEffectiveDirectionalityOfDirAuto if this element hasn't been marked with selfOrPrecedingNodesAffectDirAuto. Otherwise, we'd set selfOrPrecedingNodesAffectDirAuto on input element without dir=auto. This was caught by new assertions. (WebCore::HTMLInputElement::setValue): Added a call to updateEffectiveDirectionalityOfDirAuto when selfOrPrecedingNodesAffectDirAuto is set. This is needed now that the effective text direction is cached as opposed to re-computed each time in computeDirectionality. * Source/WebCore/html/HTMLTextAreaElement.cpp: (WebCore::HTMLTextAreaElement::subtreeHasChanged): Same as HTMLInputElement. (WebCore::HTMLTextAreaElement::setValueCommon): Ditto. Canonical link: https://commits.webkit.org/254017@main

webkit-commit-queue · 2022-09-01T00:10:35Z

Committed 254017@main (ded49fa): https://commits.webkit.org/254017@main

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

rniwa requested a review from cdumez as a code owner August 30, 2022 13:41

rniwa self-assigned this Aug 30, 2022

rniwa added CSS Cascading Style Sheets implementation WebKit Nightly Build labels Aug 30, 2022

rniwa requested a review from anttijk August 30, 2022 13:42

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Aug 30, 2022

rniwa removed the merging-blocked Applied to prevent a change from being merged label Aug 30, 2022

rniwa force-pushed the fix243093 branch from 3b4bd1a to 3f4a1ca Compare August 30, 2022 22:03

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Aug 30, 2022

rniwa removed the merging-blocked Applied to prevent a change from being merged label Aug 30, 2022

rniwa force-pushed the fix243093 branch from 3f4a1ca to 3dd613d Compare August 30, 2022 23:07

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Aug 31, 2022

rniwa removed the merging-blocked Applied to prevent a change from being merged label Aug 31, 2022

rniwa force-pushed the fix243093 branch from 3dd613d to d5046df Compare August 31, 2022 02:18

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Aug 31, 2022

rniwa removed the merging-blocked Applied to prevent a change from being merged label Aug 31, 2022

rniwa force-pushed the fix243093 branch from d5046df to 390f61e Compare August 31, 2022 05:12

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Aug 31, 2022

rniwa removed the merging-blocked Applied to prevent a change from being merged label Aug 31, 2022

rniwa force-pushed the fix243093 branch from 390f61e to 7dae483 Compare August 31, 2022 06:05

anttijk approved these changes Aug 31, 2022

View reviewed changes

rniwa added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Aug 31, 2022

webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Aug 31, 2022

webkit-commit-queue added the merging-blocked Applied to prevent a change from being merged label Aug 31, 2022

rniwa removed the merging-blocked Applied to prevent a change from being merged label Aug 31, 2022

rniwa force-pushed the fix243093 branch from 7dae483 to 760a9df Compare August 31, 2022 17:20

rniwa added the merge-queue Applied to send a pull request to merge-queue label Aug 31, 2022

webkit-early-warning-system force-pushed the fix243093 branch from 760a9df to ded49fa Compare September 1, 2022 00:10

webkit-early-warning-system merged commit ded49fa into WebKit:main Sep 1, 2022

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Sep 1, 2022

rniwa deleted the fix243093 branch September 21, 2022 05:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

:has(~:dir(~)) should work #3801

:has(~:dir(~)) should work #3801

rniwa commented Aug 30, 2022 •

edited by webkit-early-warning-system

Loading

webkit-early-warning-system commented Aug 30, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 30, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 30, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 31, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 31, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 31, 2022 •

edited

Loading

anttijk Aug 31, 2022

rniwa Aug 31, 2022

webkit-commit-queue commented Aug 31, 2022

webkit-early-warning-system commented Aug 31, 2022 •

edited

Loading

webkit-commit-queue commented Sep 1, 2022

		webkit.org/b/64861 imported/w3c/web-platform-tests/css/selectors/dir-style-01a.html [ ImageOnlyFailure ]
		webkit.org/b/64861 imported/w3c/web-platform-tests/css/selectors/dir-style-01b.html [ ImageOnlyFailure ]

:has(~:dir(~)) should work #3801

:has(~:dir(~)) should work #3801

Conversation

rniwa commented Aug 30, 2022 • edited by webkit-early-warning-system Loading

ded49fa

webkit-early-warning-system commented Aug 30, 2022 • edited Loading

webkit-early-warning-system commented Aug 30, 2022 • edited Loading

webkit-early-warning-system commented Aug 30, 2022 • edited Loading

webkit-early-warning-system commented Aug 31, 2022 • edited Loading

webkit-early-warning-system commented Aug 31, 2022 • edited Loading

webkit-early-warning-system commented Aug 31, 2022 • edited Loading

anttijk Aug 31, 2022

Choose a reason for hiding this comment

rniwa Aug 31, 2022

Choose a reason for hiding this comment

webkit-commit-queue commented Aug 31, 2022

webkit-early-warning-system commented Aug 31, 2022 • edited Loading

webkit-commit-queue commented Sep 1, 2022

rniwa commented Aug 30, 2022 •

edited by webkit-early-warning-system

Loading

`ded49fa`

webkit-early-warning-system commented Aug 30, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 30, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 30, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 31, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 31, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 31, 2022 •

edited

Loading

webkit-early-warning-system commented Aug 31, 2022 •

edited

Loading