commit 3e729cb87e858b4b50a348586a45b25b18f5c841
author antti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sun Feb 13 12:21:50 2022 +0000
committer antti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sun Feb 13 12:21:50 2022 +0000
tree f513021e36802bed042d34f1ba1aabdd44d9dc0e
parent e3763d4cff2c3635e678146830e95843e5909d70

[CSS Container Queries] Add separate ContainerQuery and FilteredContainerQuery types
https://bugs.webkit.org/show_bug.cgi?id=236515

Reviewed by Alan Bujtas.

ContainerQuery is just a type alias to MediaQuerySet for now.
FilteredContainerQuery is a ContainerQuery plus name filter (type filter coming later).

* WebCore.xcodeproj/project.pbxproj:
* css/ContainerQuery.h: Added.

Move to a file of its own.

* css/StyleRule.cpp:
(WebCore::StyleRuleContainer::StyleRuleContainer):
(WebCore::StyleRuleContainer::create):
* css/StyleRule.h:
* style/ContainerQueryEvaluator.cpp:
(WebCore::Style::ContainerQueryEvaluator::evaluate const):
* style/ContainerQueryEvaluator.h:
* style/ElementRuleCollector.cpp:
(WebCore::Style::ElementRuleCollector::containerQueryMatches):
* style/ElementRuleCollector.h:
* style/RuleSet.h:
(WebCore::Style::RuleSet::containerQueryFor const):
* style/RuleSetBuilder.cpp:
(WebCore::Style::RuleSetBuilder::addChildRules):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@289706 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/css/StyleRule.cpp

diff --git a/Source/WebCore/css/StyleRule.cpp b/Source/WebCore/css/StyleRule.cpp
index 2d43d5d..63d24ed 100644
--- a/Source/WebCore/css/StyleRule.cpp
+++ b/Source/WebCore/css/StyleRule.cpp
@@ -536,30 +536,30 @@
     return adoptRef(*new StyleRuleLayer(WTFMove(name), WTFMove(rules)));
 }
 
-StyleRuleContainer::StyleRuleContainer(ContainerQuery&& query, Vector<RefPtr<StyleRuleBase>>&& rules)
+StyleRuleContainer::StyleRuleContainer(FilteredContainerQuery&& query, Vector<RefPtr<StyleRuleBase>>&& rules)
     : StyleRuleGroup(StyleRuleType::Container, WTFMove(rules))
-    , m_query(WTFMove(query))
+    , m_filteredQuery(WTFMove(query))
 {
 }
 
-StyleRuleContainer::StyleRuleContainer(ContainerQuery&& query, std::unique_ptr<DeferredStyleGroupRuleList>&& rules)
+StyleRuleContainer::StyleRuleContainer(FilteredContainerQuery&& query, std::unique_ptr<DeferredStyleGroupRuleList>&& rules)
     : StyleRuleGroup(StyleRuleType::Container, WTFMove(rules))
-    , m_query(WTFMove(query))
+    , m_filteredQuery(WTFMove(query))
 {
 }
 
 StyleRuleContainer::StyleRuleContainer(const StyleRuleContainer& other)
     : StyleRuleGroup(other)
-    , m_query(other.m_query)
+    , m_filteredQuery(other.m_filteredQuery)
 {
 }
 
-Ref<StyleRuleContainer> StyleRuleContainer::create(ContainerQuery&& query, Vector<RefPtr<StyleRuleBase>>&& rules)
+Ref<StyleRuleContainer> StyleRuleContainer::create(FilteredContainerQuery&& query, Vector<RefPtr<StyleRuleBase>>&& rules)
 {
     return adoptRef(*new StyleRuleContainer(WTFMove(query), WTFMove(rules)));
 }
 
-Ref<StyleRuleContainer> StyleRuleContainer::create(ContainerQuery&& query, std::unique_ptr<DeferredStyleGroupRuleList>&& rules)
+Ref<StyleRuleContainer> StyleRuleContainer::create(FilteredContainerQuery&& query, std::unique_ptr<DeferredStyleGroupRuleList>&& rules)
 {
     return adoptRef(*new StyleRuleContainer(WTFMove(query), WTFMove(rules)));
 }