[webkit-changes] [WebKit/WebKit] b4b81d: Make container and media query parsers static

Antti Koivisto noreply at github.com
Tue Feb 6 08:24:27 PST 2024


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: b4b81de18ca795f39d87bad1b328a7a9a64371c7
      https://github.com/WebKit/WebKit/commit/b4b81de18ca795f39d87bad1b328a7a9a64371c7
  Author: Antti Koivisto <antti at apple.com>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M Source/WebCore/Headers.cmake
    M Source/WebCore/Sources.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    R Source/WebCore/css/ContainerQuery.cpp
    R Source/WebCore/css/ContainerQuery.h
    R Source/WebCore/css/ContainerQueryParser.cpp
    R Source/WebCore/css/ContainerQueryParser.h
    M Source/WebCore/css/parser/CSSParserImpl.cpp
    A Source/WebCore/css/query/ContainerQuery.cpp
    A Source/WebCore/css/query/ContainerQuery.h
    A Source/WebCore/css/query/ContainerQueryParser.cpp
    A Source/WebCore/css/query/ContainerQueryParser.h
    M Source/WebCore/css/query/GenericMediaQueryParser.cpp
    M Source/WebCore/css/query/GenericMediaQueryParser.h
    M Source/WebCore/css/query/MediaQueryParser.cpp
    M Source/WebCore/css/query/MediaQueryParser.h

  Log Message:
  -----------
  Make container and media query parsers static
https://bugs.webkit.org/show_bug.cgi?id=268822
rdar://122384606

Reviewed by Alan Baradlay.

Simplify the code by avoiding unnecessary instantiation of the generic query parser.

* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/css/parser/CSSParserImpl.cpp:
(WebCore::CSSParserImpl::consumeContainerRule):
* Source/WebCore/css/query/ContainerQuery.cpp: Renamed from Source/WebCore/css/ContainerQuery.cpp.
* Source/WebCore/css/query/ContainerQuery.h: Renamed from Source/WebCore/css/ContainerQuery.h.

Also move this to css/query directory.

* Source/WebCore/css/query/ContainerQueryParser.cpp: Renamed from Source/WebCore/css/ContainerQueryParser.cpp.
(WebCore::CQ::ContainerQueryParser::consumeContainerQuery):
* Source/WebCore/css/query/ContainerQueryParser.h: Renamed from Source/WebCore/css/ContainerQueryParser.h.

Also move ContainerQueryParser to css/query directory.
Also move ContainerQueryParser to CQ namespace.

* Source/WebCore/css/query/GenericMediaQueryParser.cpp:
(WebCore::MQ::FeatureParser::consumeFeature):
(WebCore::MQ::FeatureParser::consumeBooleanOrPlainFeature):
(WebCore::MQ::FeatureParser::consumeRangeFeature):
(WebCore::MQ::FeatureParser::consumeValue):
(WebCore::MQ::FeatureParser::validateFeatureAgainstSchema):
(WebCore::MQ::GenericMediaQueryParserBase::consumeFeature): Deleted.
(WebCore::MQ::GenericMediaQueryParserBase::consumeBooleanOrPlainFeature): Deleted.
(WebCore::MQ::GenericMediaQueryParserBase::consumeRangeFeature): Deleted.
(WebCore::MQ::GenericMediaQueryParserBase::consumeValue): Deleted.
(WebCore::MQ::GenericMediaQueryParserBase::validateFeatureAgainstSchema): Deleted.
* Source/WebCore/css/query/GenericMediaQueryParser.h:
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::consumeCondition):
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::consumeQueryInParens):
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::consumeAndValidateFeature):
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::validateFeature):
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::schemaForFeatureName):
(WebCore::MQ::GenericMediaQueryParserBase::GenericMediaQueryParserBase): Deleted.
(WebCore::MQ::GenericMediaQueryParser::GenericMediaQueryParser): Deleted.
(WebCore::MQ::GenericMediaQueryParser::concreteParser): Deleted.
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::consumeFeature): Deleted.
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::schemaForFeatureName const): Deleted.
* Source/WebCore/css/query/MediaQueryParser.cpp:
(WebCore::MQ::MediaQueryParser::parse):
(WebCore::MQ::MediaQueryParser::parseCondition):
(WebCore::MQ::MediaQueryParser::consumeMediaQueryList):
(WebCore::MQ::MediaQueryParser::consumeMediaQuery):
(WebCore::MQ::MediaQueryParser::schemaForFeatureName):
(WebCore::MQ::MediaQueryParser::MediaQueryParser): Deleted.
(WebCore::MQ::MediaQueryParser::schemaForFeatureName const): Deleted.
* Source/WebCore/css/query/MediaQueryParser.h:

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




More information about the webkit-changes mailing list