Changeset 292375 in webkit for trunk/Source/WebCore/css/ContainerQuery.cpp

Timestamp:

Apr 4, 2022, 10:36:45 PM (3 years ago)

Author:

Antti Koivisto

Message:

[CSS Container Queries] Simplify grammar
​https://bugs.webkit.org/show_bug.cgi?id=238732

Reviewed by Sam Weinig.

Because size() function syntax is no longer supported, separate SizeQuery and SizeCondition productions
are no longer needed.

Some slightly unnecessary templatization is retained to help with future work.

• css/ContainerQuery.cpp:
• css/ContainerQuery.h:
• css/ContainerQueryParser.cpp:

(WebCore::ContainerQueryParser::consumeContainerQuery):
(WebCore::ContainerQueryParser::consumeCondition):
(WebCore::ContainerQueryParser::consumeSizeFeature):
(WebCore::ContainerQueryParser::consumePlainSizeFeature):
(WebCore::ContainerQueryParser::consumeSizeQuery): Deleted.

• css/ContainerQueryParser.h:
• style/ContainerQueryEvaluator.cpp:

(WebCore::Style::ContainerQueryEvaluator::evaluateQuery const):

• style/ContainerQueryEvaluator.h:

File:

• trunk/Source/WebCore/css/ContainerQuery.cpp (modified) (2 diffs)

trunk/Source/WebCore/css/ContainerQuery.cpp

@@ -88 +88 @@
 }
 
-void serialize(StringBuilder&, const SizeQuery&);
 void serialize(StringBuilder&, const SizeFeature&);
 template<typename ConditionType> void serialize(StringBuilder&, const ConditionType&);
@@ -103 +102 @@
         builder.append(unknownQuery.text);
         builder.append(')');
-    });
-}
-
-void serialize(StringBuilder& builder, const SizeQuery& sizeQuery)
-{
-    WTF::switchOn(sizeQuery, [&](auto& node) {
-        serialize(builder, node);
     });
 }