[webkit-changes] [WebKit/WebKit] e1cd9d: [MQ4] Use FeatureSchema more

[Antti Koivisto]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: e1cd9d97b6c9384243a881494f92938a58acea84
      https://github.com/WebKit/WebKit/commit/e1cd9d97b6c9384243a881494f92938a58acea84
  Author: Antti Koivisto <antti at apple.com>
  Date:   2022-10-21 (Fri, 21 Oct 2022)

  Changed paths:
    M Source/WebCore/css/ContainerQuery.cpp
    M Source/WebCore/css/ContainerQuery.h
    M Source/WebCore/css/ContainerQueryParser.cpp
    M Source/WebCore/css/ContainerQueryParser.h
    M Source/WebCore/css/query/GenericMediaQueryEvaluator.cpp
    M Source/WebCore/css/query/GenericMediaQueryEvaluator.h
    M Source/WebCore/css/query/GenericMediaQueryParser.cpp
    M Source/WebCore/css/query/GenericMediaQueryParser.h
    M Source/WebCore/css/query/GenericMediaQueryTypes.h
    M Source/WebCore/css/query/MediaQueryEvaluator.cpp
    M Source/WebCore/css/query/MediaQueryEvaluator.h
    M Source/WebCore/css/query/MediaQueryParser.cpp
    M Source/WebCore/css/query/MediaQueryParser.h
    M Source/WebCore/style/ContainerQueryEvaluator.cpp
    M Source/WebCore/style/ContainerQueryEvaluator.h

  Log Message:
  -----------
  [MQ4] Use FeatureSchema more
https://bugs.webkit.org/show_bug.cgi?id=246804
<rdar://problem/101381659>

Reviewed by Alan Bujtas.

Move FeatureSchemas out of the parser and use them instead of feature name strings in comparisons.
Also remove an unneeeded template argument and base class from Evaluator.

* Source/WebCore/css/ContainerQuery.cpp:
(WebCore::CQ::FeatureSchemas::width):
(WebCore::CQ::FeatureSchemas::height):
(WebCore::CQ::FeatureSchemas::inlineSize):
(WebCore::CQ::FeatureSchemas::blockSize):
(WebCore::CQ::FeatureSchemas::aspectRatio):
(WebCore::CQ::FeatureSchemas::orientation):
(WebCore::CQ::requiredAxesForFeature):
(WebCore::CQ::FeatureNames::width): Deleted.
(WebCore::CQ::FeatureNames::height): Deleted.
(WebCore::CQ::FeatureNames::inlineSize): Deleted.
(WebCore::CQ::FeatureNames::blockSize): Deleted.
(WebCore::CQ::FeatureNames::aspectRatio): Deleted.
(WebCore::CQ::FeatureNames::orientation): Deleted.
* Source/WebCore/css/ContainerQuery.h:
* Source/WebCore/css/ContainerQueryParser.cpp:
(WebCore::ContainerQueryParser::featureSchemas): Deleted.
* Source/WebCore/css/ContainerQueryParser.h:
* Source/WebCore/css/query/GenericMediaQueryEvaluator.cpp:
(WebCore::MQ::evaluateLengthFeature):
(WebCore::MQ::evaluateRatioFeature):
(WebCore::MQ::evaluateDiscreteFeature):
(WebCore::MQ::GenericMediaQueryEvaluatorBase::evaluateLengthFeature const): Deleted.
(WebCore::MQ::GenericMediaQueryEvaluatorBase::evaluateRatioFeature const): Deleted.
(WebCore::MQ::GenericMediaQueryEvaluatorBase::evaluateDiscreteFeature const): Deleted.
* Source/WebCore/css/query/GenericMediaQueryEvaluator.h:
(WebCore::MQ::GenericMediaQueryEvaluator<ConcreteEvaluator>::evaluateQueryInParens const):
(WebCore::MQ::GenericMediaQueryEvaluator<ConcreteEvaluator>::evaluateCondition const):
* Source/WebCore/css/query/GenericMediaQueryParser.cpp:
(WebCore::MQ::GenericMediaQueryParserBase::validateFeatureAgainstSchema):
* Source/WebCore/css/query/GenericMediaQueryParser.h:
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::schemaForFeatureName const):
* Source/WebCore/css/query/GenericMediaQueryTypes.h:
* Source/WebCore/css/query/MediaQueryEvaluator.cpp:
(WebCore::MQ::MediaQueryEvaluator::MediaQueryEvaluator):
(WebCore::MQ::MediaQueryEvaluator::evaluate const):
(WebCore::MQ::MediaQueryEvaluator::evaluateFeature const):
* Source/WebCore/css/query/MediaQueryEvaluator.h:
* Source/WebCore/css/query/MediaQueryParser.cpp:
(WebCore::MQ::MediaQueryParser::featureSchemas): Deleted.
* Source/WebCore/css/query/MediaQueryParser.h:
* Source/WebCore/style/ContainerQueryEvaluator.cpp:
(WebCore::Style::ContainerQueryEvaluator::evaluate const):
(WebCore::Style::ContainerQueryEvaluator::featureEvaluationContextForQuery const):
(WebCore::Style::ContainerQueryEvaluator::evaluateFeature const):
(): Deleted.
(WebCore::Style::ContainerQueryEvaluator::selectContainer const): Deleted.
* Source/WebCore/style/ContainerQueryEvaluator.h:

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