[webkit-changes] [WebKit/WebKit] aacea0: [MQ4] Disallow negative values

Antti Koivisto noreply at github.com
Mon Nov 28 23:51:09 PST 2022


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: aacea0b8da7d3a333b3d354797056135b65bdac7
      https://github.com/WebKit/WebKit/commit/aacea0b8da7d3a333b3d354797056135b65bdac7
  Author: Antti Koivisto <antti at apple.com>
  Date:   2022-11-28 (Mon, 28 Nov 2022)

  Changed paths:
    M LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-1-expected.txt
    M LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-2-expected.txt
    M LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-3-expected.txt
    M LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-4-expected.txt
    M LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/at-container-style-serialization-expected.txt
    M LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-1-expected.txt
    M LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-2-expected.txt
    M LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-3-expected.txt
    M LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-4-expected.txt
    M Source/WebCore/css/ContainerQueryParser.h
    M Source/WebCore/css/query/ContainerQueryFeatures.cpp
    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/MediaQueryEvaluator.cpp
    M Source/WebCore/css/query/MediaQueryEvaluator.h
    M Source/WebCore/css/query/MediaQueryFeatures.cpp
    M Source/WebCore/css/query/MediaQueryParser.cpp
    M Source/WebCore/css/query/MediaQueryParser.h

  Log Message:
  -----------
  [MQ4] Disallow negative values
https://bugs.webkit.org/show_bug.cgi?id=248396
<rdar://problem/102723342>

Reviewed by Alan Baradlay.

Disallow negative values for now even though they are allowed by the spec (https://www.w3.org/TR/mediaqueries-4/#false-in-the-negative-range).
The current WPTs don't yet follow this behavior and no other engine implements it. It is better enabled separately.

Also other parsing and evaluation fixes.

* LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-1-expected.txt:
* LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-2-expected.txt:
* LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-3-expected.txt:
* LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-4-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/at-container-style-serialization-expected.txt:
* LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-1-expected.txt:
* LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-2-expected.txt:
* LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-3-expected.txt:
* LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-w3c-4-expected.txt:
* Source/WebCore/css/ContainerQueryParser.h:
(WebCore::ContainerQueryParser::rejectInvalidFeatures): Deleted.

This is not needed, we can always turn invalid features into 'general enclosed' production.

* Source/WebCore/css/query/ContainerQueryFeatures.cpp:
(WebCore::CQ::Features::aspectRatio):
* Source/WebCore/css/query/GenericMediaQueryEvaluator.cpp:
(WebCore::MQ::evaluateRatioComparison):
(WebCore::MQ::evaluateRatioFeature):

Evaluate ratios by multiplication with numerator and denominator to avoid accuracy issues.

* Source/WebCore/css/query/GenericMediaQueryEvaluator.h:
* Source/WebCore/css/query/GenericMediaQueryParser.cpp:
(WebCore::MQ::consumeRatioWithSlash):
(WebCore::MQ::GenericMediaQueryParserBase::consumeValue):

Try parse as ratio-with-slash first.

(WebCore::MQ::GenericMediaQueryParserBase::validateFeatureAgainstSchema):

Disallow negative values.

* Source/WebCore/css/query/GenericMediaQueryParser.h:
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::consumeQueryInParens):
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::consumeFeature):
(WebCore::MQ::GenericMediaQueryParser<ConcreteParser>::validateFeature):
* Source/WebCore/css/query/MediaQueryEvaluator.cpp:
(WebCore::MQ::MediaQueryEvaluator::MediaQueryEvaluator):
(WebCore::MQ::MediaQueryEvaluator::evaluate const):

Support static evaluation where feature evaluation is always true or false.

(WebCore::MQ::MediaQueryEvaluator::isPrintMedia const):
* Source/WebCore/css/query/MediaQueryEvaluator.h:
* Source/WebCore/css/query/MediaQueryFeatures.cpp:
(WebCore::MQ::Features::aspectRatio):
(WebCore::MQ::Features::deviceAspectRatio):
(WebCore::MQ::Features::height):

Adjust for zoom.

(WebCore::MQ::Features::scan):

Never mathces.

(WebCore::MQ::Features::transform3d):

Typo fix.

(WebCore::MQ::Features::width):

Adjust for zoom.

* Source/WebCore/css/query/MediaQueryParser.cpp:
(WebCore::MQ::MediaQueryParser::parse):
(WebCore::MQ::MediaQueryParser::consumeMediaQuery):
(WebCore::MQ::MediaQueryParser::schemaForFeatureName const):

Disallow prefers-dark-interface parsing when useSystemAppearanc is false (to keep with existing behavior).

(WebCore::MQ::serialize):

Don't write our 'all' when not needed.

* Source/WebCore/css/query/MediaQueryParser.h:
(WebCore::MQ::MediaQueryParser::rejectInvalidFeatures): Deleted.

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




More information about the webkit-changes mailing list