[webkit-changes] [WebKit/WebKit] 6dd2f9: [MQ4] Make the evaluation function a part of the F...

Antti Koivisto noreply at github.com
Mon Oct 24 22:58:44 PDT 2022


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

  Changed paths:
    M Source/WebCore/Sources.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/css/ContainerQuery.cpp
    M Source/WebCore/css/ContainerQueryParser.cpp
    A Source/WebCore/css/query/ContainerQueryFeatures.cpp
    A Source/WebCore/css/query/ContainerQueryFeatures.h
    M Source/WebCore/css/query/GenericMediaQueryEvaluator.h
    M Source/WebCore/css/query/GenericMediaQueryTypes.h
    M Source/WebCore/style/ContainerQueryEvaluator.cpp
    M Source/WebCore/style/ContainerQueryEvaluator.h

  Log Message:
  -----------
  [MQ4] Make the evaluation function a part of the FeatureSchema
https://bugs.webkit.org/show_bug.cgi?id=246948
<rdar://problem/101500034>.

Reviewed by Alan Bujtas.

Make FeatureSchema responsible of doing the actual feature evaluation.

* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/css/ContainerQuery.cpp:
(WebCore::CQ::requiredAxesForFeature):
(WebCore::CQ::FeatureSchemas::width): Deleted.
(WebCore::CQ::FeatureSchemas::height): Deleted.
(WebCore::CQ::FeatureSchemas::inlineSize): Deleted.
(WebCore::CQ::FeatureSchemas::blockSize): Deleted.
(WebCore::CQ::FeatureSchemas::aspectRatio): Deleted.
(WebCore::CQ::FeatureSchemas::orientation): Deleted.
* Source/WebCore/css/ContainerQueryParser.cpp:
* Source/WebCore/css/query/ContainerQueryFeatures.cpp: Added.
(WebCore::CQ::Features::SizeFeatureSchema::SizeFeatureSchema):
(WebCore::CQ::Features::width):
(WebCore::CQ::Features::height):
(WebCore::CQ::Features::inlineSize):
(WebCore::CQ::Features::blockSize):
(WebCore::CQ::Features::aspectRatio):
(WebCore::CQ::Features::orientation):

Move container query FeatureSchemas to a file of their own and add evaluation functions.

* Source/WebCore/css/query/ContainerQueryFeatures.h: Added.
* Source/WebCore/css/query/GenericMediaQueryEvaluator.h:
(WebCore::MQ::GenericMediaQueryEvaluator<ConcreteEvaluator>::evaluateFeature const):
(): Deleted.
* Source/WebCore/css/query/GenericMediaQueryTypes.h:
(WebCore::MQ::FeatureSchema::evaluate const):
(WebCore::MQ::FeatureSchema::FeatureSchema):
* Source/WebCore/style/ContainerQueryEvaluator.cpp:
(WebCore::Style::ContainerQueryEvaluator::featureEvaluationContextForQuery const):
(WebCore::Style::ContainerQueryEvaluator::evaluateFeature const): Deleted.

Evaluation moves to the generic code.

* Source/WebCore/style/ContainerQueryEvaluator.h:

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




More information about the webkit-changes mailing list