[webkit-changes] [WebKit/WebKit] 7c3922: [MQ4] Make more media query code generic

[Antti Koivisto]

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

  Changed paths:
    M Source/WebCore/Sources.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/css/CSSContainerRule.cpp
    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.h
    M Source/WebCore/css/query/GenericMediaQueryParser.cpp
    M Source/WebCore/css/query/GenericMediaQueryParser.h
    A Source/WebCore/css/query/GenericMediaQuerySerialization.cpp
    A Source/WebCore/css/query/GenericMediaQuerySerialization.h
    M Source/WebCore/css/query/GenericMediaQueryTypes.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] Make more media query code generic
https://bugs.webkit.org/show_bug.cgi?id=246452
rdar://101121497

Reviewed by Alan Bujtas.

More sharing between media queries and container queries.
Also implement serialization.

* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/css/CSSContainerRule.cpp:
(WebCore::CSSContainerRule::conditionText const):
* Source/WebCore/css/ContainerQuery.cpp:
* Source/WebCore/css/ContainerQuery.h:
(): Deleted.
* Source/WebCore/css/ContainerQueryParser.cpp:
(WebCore::ContainerQueryParser::consumeContainerQuery):
(WebCore::ContainerQueryParser::consumeFeature):
(WebCore::ContainerQueryParser::consumeQueryInParens): Deleted.
(WebCore::ContainerQueryParser::consumeSizeFeature): Deleted.
* Source/WebCore/css/ContainerQueryParser.h:
* 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::consumeFeature):
* Source/WebCore/css/query/GenericMediaQueryParser.h:
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::consumeCondition):
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::consumeQueryInParens):
* Source/WebCore/css/query/GenericMediaQuerySerialization.cpp: Added.
(WebCore::MQ::serialize):
* Source/WebCore/css/query/GenericMediaQuerySerialization.h: Copied from Source/WebCore/css/query/GenericMediaQueryTypes.h.
* Source/WebCore/css/query/GenericMediaQueryTypes.h:
* Source/WebCore/css/query/MediaQueryParser.cpp:
(WebCore::MQ::MediaQueryParser::MediaQueryParser):
(WebCore::MQ::MediaQueryParser::consumeMediaQuery):
(WebCore::MQ::serialize):
(WebCore::MQ::MediaQueryParser::consumeQueryInParens): Deleted.
(WebCore::MQ::MediaQueryParser::consumeMediaFeature): Deleted.
* Source/WebCore/css/query/MediaQueryParser.h:
(WebCore::MQ::MediaQueryParser::MediaQueryParser): Deleted.
* Source/WebCore/style/ContainerQueryEvaluator.cpp:
(WebCore::Style::ContainerQueryEvaluator::evaluateFeature const):
(WebCore::Style::ContainerQueryEvaluator::evaluateQueryInParens const): Deleted.
(WebCore::Style::ContainerQueryEvaluator::evaluateSizeFeature const): Deleted.
* Source/WebCore/style/ContainerQueryEvaluator.h:

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