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.

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

Rename CSSSelector's RelationType to Relation #22221

Merged
merged 1 commit into from
Dec 23, 2023
Merged

Rename CSSSelector's RelationType to Relation #22221

merged 1 commit into from
Dec 23, 2023

Conversation

annevk
Copy link
Contributor

@annevk annevk commented Dec 23, 2023 •
edited by webkit-early-warning-system
Loading

58aaae7

Rename CSSSelector's RelationType to Relation
https://bugs.webkit.org/show_bug.cgi?id=266842

Reviewed by Tim Nguyen.

This makes it consistent with the other enums.

* Source/WebCore/css/CSSSelector.cpp:
(WebCore::CSSSelector::CSSSelector):
(WebCore::CSSSelector::firstInCompound const):
(WebCore::CSSSelector::selectorText const):
* Source/WebCore/css/CSSSelector.h:
(WebCore::CSSSelector::hasDescendantRelation const):
(WebCore::CSSSelector::hasDescendantOrChildRelation const):
(WebCore::CSSSelector::relation const):
(WebCore::CSSSelector::isSiblingSelector const):
(WebCore::CSSSelector::setRelation):
* Source/WebCore/css/SelectorChecker.cpp:
(WebCore::SelectorChecker::matchRecursively const):
(WebCore::canMatchHoverOrActiveInQuirksMode):
(WebCore::SelectorChecker::determineLinkMatchType):
* Source/WebCore/css/SelectorFilter.cpp:
(WebCore::SelectorFilter::collectSelectorHashes):
* Source/WebCore/css/parser/CSSParserSelector.cpp:
(WebCore::CSSParserSelector::insertTagHistory):
(WebCore::CSSParserSelector::appendTagHistory):
(WebCore::CSSParserSelector::appendTagHistoryAsRelative):
(WebCore::CSSParserSelector::prependTagSelector):
(WebCore::CSSParserSelector::releaseTagHistory):
(WebCore::CSSParserSelector::startsWithExplicitCombinator const):
* Source/WebCore/css/parser/CSSParserSelector.h:
(WebCore::CSSParserSelector::setRelation):
* Source/WebCore/css/parser/CSSSelectorParser.cpp:
(WebCore::isDescendantCombinator):
(WebCore::CSSSelectorParser::consumeComplexSelector):
(WebCore::CSSSelectorParser::consumeRelativeScopeSelector):
(WebCore::CSSSelectorParser::consumeRelativeNestedSelector):
(WebCore::CSSSelectorParser::consumeCompoundSelector):
(WebCore::CSSSelectorParser::consumeCombinator):
(WebCore::CSSSelectorParser::splitCompoundAtImplicitShadowCrossingCombinator):
* Source/WebCore/css/parser/CSSSelectorParser.h:
* Source/WebCore/cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::fragmentRelationForSelectorRelation):
(WebCore::SelectorCompiler::constructFragmentsInternal):
* Source/WebCore/dom/SelectorQuery.cpp:
(WebCore::findIdMatchingType):
(WebCore::selectorForIdLookup):
(WebCore::filterRootById):
* Source/WebCore/style/HasSelectorFilter.cpp:
(WebCore::Style::HasSelectorFilter::makeKey):
* Source/WebCore/style/RuleData.cpp:
(WebCore::Style::computeContainsUncommonAttributeSelector):
* Source/WebCore/style/RuleFeature.cpp:
(WebCore::Style::computeNextMatchElement):
(WebCore::Style::computeNextHasPseudoClassMatchElement):
(WebCore::Style::makePseudoClassInvalidationKey):
* Source/WebCore/style/RuleSet.cpp:
(WebCore::Style::isHostSelectorMatchingInShadowTree):
(WebCore::Style::RuleSet::addRule):

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

16c7725

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
✅ 🧪 ios-wk2-wpt   🧪 mac-wk1 ✅ 🛠 gtk
✅ 🧪 api-ios   🧪 mac-wk2   🧪 gtk-wk2
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv-sim
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@annevk annevk self-assigned this Dec 23, 2023
@annevk annevk added the CSS Cascading Style Sheets implementation label Dec 23, 2023
@webkit-early-warning-system

This comment was marked as outdated.

Sign in to view
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 23, 2023
@annevk annevk removed the merging-blocked Applied to prevent a change from being merged label Dec 23, 2023
@annevk annevk force-pushed the eng/Rename-CSSSelectors-RelationType-to-Relation branch from f43dd03 to ef81192 Compare December 23, 2023 09:40
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Dec 23, 2023 •
edited
Loading

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

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
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv-sim
❌ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@annevk annevk added merge-queue Applied to send a pull request to merge-queue and removed merge-queue Applied to send a pull request to merge-queue labels Dec 23, 2023
@annevk annevk force-pushed the eng/Rename-CSSSelectors-RelationType-to-Relation branch from ef81192 to 16c7725 Compare December 23, 2023 16:46
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Dec 23, 2023 •
edited
Loading

EWS run on current version of this PR (hash 16c7725)

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
✅ 🧪 ios-wk2-wpt   🧪 mac-wk1 ✅ 🛠 gtk
✅ 🧪 api-ios   🧪 mac-wk2   🧪 gtk-wk2
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv-sim
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@annevk annevk added the merge-queue Applied to send a pull request to merge-queue label Dec 23, 2023
@annevk
Rename CSSSelector's RelationType to Relation
58aaae7 
https://bugs.webkit.org/show_bug.cgi?id=266842

Reviewed by Tim Nguyen.

This makes it consistent with the other enums.

* Source/WebCore/css/CSSSelector.cpp:
(WebCore::CSSSelector::CSSSelector):
(WebCore::CSSSelector::firstInCompound const):
(WebCore::CSSSelector::selectorText const):
* Source/WebCore/css/CSSSelector.h:
(WebCore::CSSSelector::hasDescendantRelation const):
(WebCore::CSSSelector::hasDescendantOrChildRelation const):
(WebCore::CSSSelector::relation const):
(WebCore::CSSSelector::isSiblingSelector const):
(WebCore::CSSSelector::setRelation):
* Source/WebCore/css/SelectorChecker.cpp:
(WebCore::SelectorChecker::matchRecursively const):
(WebCore::canMatchHoverOrActiveInQuirksMode):
(WebCore::SelectorChecker::determineLinkMatchType):
* Source/WebCore/css/SelectorFilter.cpp:
(WebCore::SelectorFilter::collectSelectorHashes):
* Source/WebCore/css/parser/CSSParserSelector.cpp:
(WebCore::CSSParserSelector::insertTagHistory):
(WebCore::CSSParserSelector::appendTagHistory):
(WebCore::CSSParserSelector::appendTagHistoryAsRelative):
(WebCore::CSSParserSelector::prependTagSelector):
(WebCore::CSSParserSelector::releaseTagHistory):
(WebCore::CSSParserSelector::startsWithExplicitCombinator const):
* Source/WebCore/css/parser/CSSParserSelector.h:
(WebCore::CSSParserSelector::setRelation):
* Source/WebCore/css/parser/CSSSelectorParser.cpp:
(WebCore::isDescendantCombinator):
(WebCore::CSSSelectorParser::consumeComplexSelector):
(WebCore::CSSSelectorParser::consumeRelativeScopeSelector):
(WebCore::CSSSelectorParser::consumeRelativeNestedSelector):
(WebCore::CSSSelectorParser::consumeCompoundSelector):
(WebCore::CSSSelectorParser::consumeCombinator):
(WebCore::CSSSelectorParser::splitCompoundAtImplicitShadowCrossingCombinator):
* Source/WebCore/css/parser/CSSSelectorParser.h:
* Source/WebCore/cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::fragmentRelationForSelectorRelation):
(WebCore::SelectorCompiler::constructFragmentsInternal):
* Source/WebCore/dom/SelectorQuery.cpp:
(WebCore::findIdMatchingType):
(WebCore::selectorForIdLookup):
(WebCore::filterRootById):
* Source/WebCore/style/HasSelectorFilter.cpp:
(WebCore::Style::HasSelectorFilter::makeKey):
* Source/WebCore/style/RuleData.cpp:
(WebCore::Style::computeContainsUncommonAttributeSelector):
* Source/WebCore/style/RuleFeature.cpp:
(WebCore::Style::computeNextMatchElement):
(WebCore::Style::computeNextHasPseudoClassMatchElement):
(WebCore::Style::makePseudoClassInvalidationKey):
* Source/WebCore/style/RuleSet.cpp:
(WebCore::Style::isHostSelectorMatchingInShadowTree):
(WebCore::Style::RuleSet::addRule):

Canonical link: https://commits.webkit.org/272475@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Rename-CSSSelectors-RelationType-to-Relation branch from 16c7725 to 58aaae7 Compare December 23, 2023 17:48
@webkit-commit-queue
Copy link
Collaborator

Committed 272475@main (58aaae7): https://commits.webkit.org/272475@main

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

@webkit-commit-queue webkit-commit-queue merged commit 58aaae7 into WebKit:main Dec 23, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Dec 23, 2023
@annevk annevk deleted the eng/Rename-CSSSelectors-RelationType-to-Relation branch December 23, 2023 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nt1m nt1m nt1m approved these changes

@rniwa rniwa Awaiting requested review from rniwa rniwa is a code owner

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

Assignees

@annevk annevk

Labels
CSS Cascading Style Sheets implementation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@annevk @webkit-early-warning-system @webkit-commit-queue @nt1m @webkit-ews-buildbot