Attachment 451098 Details for Bug 236096 – Patch for landing

[patch] Patch for landing

bug-236096-20220207175222.patch (text/plain), 71.95 KB, created by Antti Koivisto on 2022-02-07 07:52:24 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2022-02-07 07:52:24 PST

Size: 71.95 KB

patch

obsolete

>Subversion Revision: 289044
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 73b91196e010daf203206df4d60ca166f492838c..4c73994791d4b95fbb1292982d6e9f16e0a7012d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2022-02-07  Antti Koivisto  <antti@apple.com>
>+
>+        [CSS Container Queries] Add ContainerQueryEvaluator
>+        https://bugs.webkit.org/show_bug.cgi?id=236096
>+
>+        Reviewed by Darin Adler.
>+
>+        Add ContainerQueryEvaluator. Initially it evaluates simple min/max-width/height queries.
>+
>+        * Sources.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * style/ContainerQueryEvaluator.h: Added.
>+        * style/ContainerQueryEvaluator.cpp: Added.
>+        (WebCore::Style::ContainerQueryEvaluator::ContainerQueryEvaluator):
>+        (WebCore::Style::computeLength):
>+        (WebCore::Style::ContainerQueryEvaluator::evaluate const):
>+        * style/ElementRuleCollector.cpp:
>+        (WebCore::Style::ElementRuleCollector::containerQueryMatches):
>+
>+        Start to actually evaluate container queries.
>+
> 2022-02-03  Andres Gonzalez  <andresg_22@apple.com>
> 
>         Crash in AXIsolatedObject::associatedAXObject.
>diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
>index 51bfab8880b9d6896b3078b0930dbe763711fe09..7a6f2733d7f73172a66eaaae4fc5a8ecbf1f121b 100644
>--- a/Source/WebCore/Sources.txt
>+++ b/Source/WebCore/Sources.txt
>@@ -2554,6 +2554,7 @@ storage/StorageQuotaManager.cpp
> style/AttributeChangeInvalidation.cpp
> style/ChildChangeInvalidation.cpp
> style/ClassChangeInvalidation.cpp
>+style/ContainerQueryEvaluator.cpp
> style/ElementRuleCollector.cpp
> style/HasSelectorFilter.cpp
> style/IdChangeInvalidation.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 1073322436f4ec25281ea18bf7d1810bb37d930b..dcdf4a46f4bb8adb5a0fb0c8a7f5d663a7e736d3 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -5377,6 +5377,7 @@
> 		E4A814DA1C70E10D00BF85AC /* AttributeChangeInvalidation.h in Headers */ = {isa = PBXBuildFile; fileRef = E4A814D91C70E10D00BF85AC /* AttributeChangeInvalidation.h */; };
> 		E4A814E01C7338EB00BF85AC /* IdChangeInvalidation.h in Headers */ = {isa = PBXBuildFile; fileRef = E4A814DF1C7338EB00BF85AC /* IdChangeInvalidation.h */; };
> 		E4A8D21622578DB700A8463C /* EventRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = E4A8D21422578DA000A8463C /* EventRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		E4AAB38727AA95D7009F5899 /* ContainerQueryEvaluator.h in Headers */ = {isa = PBXBuildFile; fileRef = E4AAB38527AA95D7009F5899 /* ContainerQueryEvaluator.h */; };
> 		E4ABABDD236088FE00FA4345 /* LayoutIntegrationLineLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = E4ABABDB236088FD00FA4345 /* LayoutIntegrationLineLayout.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		E4ABABE42361A32900FA4345 /* PropertyCascade.h in Headers */ = {isa = PBXBuildFile; fileRef = E4ABABE22361A32900FA4345 /* PropertyCascade.h */; };
> 		E4ABABF32368B95900FA4345 /* StyleBuilderState.h in Headers */ = {isa = PBXBuildFile; fileRef = E4ABABF22368B95800FA4345 /* StyleBuilderState.h */; };
>@@ -17497,6 +17498,8 @@
> 		E4A814DF1C7338EB00BF85AC /* IdChangeInvalidation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdChangeInvalidation.h; sourceTree = "<group>"; };
> 		E4A8D21422578DA000A8463C /* EventRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventRegion.h; sourceTree = "<group>"; };
> 		E4A8D21522578DA000A8463C /* EventRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventRegion.cpp; sourceTree = "<group>"; };
>+		E4AAB38527AA95D7009F5899 /* ContainerQueryEvaluator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContainerQueryEvaluator.h; sourceTree = "<group>"; };
>+		E4AAB38827AA95E0009F5899 /* ContainerQueryEvaluator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContainerQueryEvaluator.cpp; sourceTree = "<group>"; };
> 		E4ABABDB236088FD00FA4345 /* LayoutIntegrationLineLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutIntegrationLineLayout.h; sourceTree = "<group>"; };
> 		E4ABABDE2360893D00FA4345 /* LayoutIntegrationLineLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutIntegrationLineLayout.cpp; sourceTree = "<group>"; };
> 		E4ABABE22361A32900FA4345 /* PropertyCascade.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PropertyCascade.h; sourceTree = "<group>"; };
>@@ -31268,6 +31271,8 @@
> 				E4C4C61827452A7900A040E7 /* ChildChangeInvalidation.h */,
> 				E4A814D51C6DEE8D00BF85AC /* ClassChangeInvalidation.cpp */,
> 				E4A814D31C6DEC4000BF85AC /* ClassChangeInvalidation.h */,
>+				E4AAB38827AA95E0009F5899 /* ContainerQueryEvaluator.cpp */,
>+				E4AAB38527AA95D7009F5899 /* ContainerQueryEvaluator.h */,
> 				FBDB619A16D6032A00BB3394 /* ElementRuleCollector.cpp */,
> 				FBDB619E16D6036500BB3394 /* ElementRuleCollector.h */,
> 				E4ED3ECD2768A68800F17AC8 /* HasSelectorFilter.cpp */,
>@@ -33821,6 +33826,7 @@
> 				E596DD352519041400C275A7 /* ContactsSelectOptions.h in Headers */,
> 				A818721C0977D3C0005826D9 /* ContainerNode.h in Headers */,
> 				E1A1470811102B1500EEC0F3 /* ContainerNodeAlgorithms.h in Headers */,
>+				E4AAB38727AA95D7009F5899 /* ContainerQueryEvaluator.h in Headers */,
> 				6FB5E214221F2453003989CF /* ContentChangeObserver.h in Headers */,
> 				BC5EB9810E82072500B25965 /* ContentData.h in Headers */,
> 				51B45D211AB8D1E200117CD2 /* ContentExtension.h in Headers */,
>diff --git a/Source/WebCore/style/ContainerQueryEvaluator.cpp b/Source/WebCore/style/ContainerQueryEvaluator.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..f352830b7d7bcafa7e9be34ff17151d7b2000122
>--- /dev/null
>+++ b/Source/WebCore/style/ContainerQueryEvaluator.cpp
>@@ -0,0 +1,160 @@
>+/*
>+ * Copyright (C) 2022 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  Redistributions in binary form must reproduce the above copyright
>+ *     notice, this list of conditions and the following disclaimer in the
>+ *     documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
>+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "ContainerQueryEvaluator.h"
>+
>+#include "CSSToLengthConversionData.h"
>+#include "Document.h"
>+#include "MediaFeatureNames.h"
>+#include "MediaQuery.h"
>+#include "RenderView.h"
>+
>+namespace WebCore::Style {
>+
>+ContainerQueryEvaluator::ContainerQueryEvaluator(const Vector<Ref<const Element>>& containers)
>+    : m_containers(containers)
>+{
>+}
>+
>+static std::optional<LayoutUnit> computeSize(CSSValue* value, const CSSToLengthConversionData& conversionData)
>+{
>+    if (!is<CSSPrimitiveValue>(value))
>+        return { };
>+
>+    auto& primitiveValue = downcast<CSSPrimitiveValue>(*value);
>+    if (primitiveValue.isNumberOrInteger()) {
>+        if (primitiveValue.doubleValue())
>+            return { };
>+        return 0_lu;
>+    }
>+
>+    if (!primitiveValue.isLength())
>+        return { };
>+    return primitiveValue.computeLength<LayoutUnit>(conversionData);
>+}
>+
>+enum class Comparator { Lesser, Greater, LesserOrEqual, GreaterOrEqual, Equal, True };
>+
>+bool ContainerQueryEvaluator::evaluate(const ContainerQuery& containerQuery) const
>+{
>+    if (m_containers.isEmpty())
>+        return false;
>+
>+    // FIXME: Match the container selector.
>+    auto* renderer = m_containers.last()->renderer();
>+    if (!renderer)
>+        return false;
>+
>+    auto& view = renderer->view();
>+    CSSToLengthConversionData conversionData { &renderer->style(), &view.style(), nullptr, &view, 1 };
>+
>+    auto evaluateSize = [&](const MediaQueryExpression& expression, Comparator comparator, auto&& sizeGetter)
>+    {
>+        if (!is<RenderBox>(renderer))
>+            return false;
>+
>+        std::optional<LayoutUnit> expressionSize;
>+
>+        if (comparator != Comparator::True) {
>+            expressionSize = computeSize(expression.value(), conversionData);
>+            if (!expressionSize)
>+                return false;
>+        }
>+
>+        auto size = sizeGetter(downcast<RenderBox>(*renderer));
>+
>+        switch (comparator) {
>+        case Comparator::Lesser:
>+            return size < *expressionSize;
>+        case Comparator::Greater:
>+            return size > *expressionSize;
>+        case Comparator::LesserOrEqual:
>+            return size <= *expressionSize;
>+        case Comparator::GreaterOrEqual:
>+            return size >= *expressionSize;
>+        case Comparator::Equal:
>+            return size == *expressionSize;
>+        case Comparator::True:
>+            return !!size;
>+        }
>+    };
>+
>+    auto evaluateWidth = [&](const MediaQueryExpression& expression, Comparator comparator)
>+    {
>+        return evaluateSize(expression, comparator, [&](const RenderBox& renderer) {
>+            return renderer.width();
>+        });
>+    };
>+
>+    auto evaluateHeight = [&](const MediaQueryExpression& expression, Comparator comparator)
>+    {
>+        return evaluateSize(expression, comparator, [&](const RenderBox& renderer) {
>+            return renderer.height();
>+        });
>+    };
>+
>+    bool result = false;
>+
>+    // FIXME: This is very rudimentary.
>+    auto& queries = containerQuery.query->queryVector();
>+    for (auto& query : queries) {
>+        for (auto& expression : query.expressions()) {
>+            if (expression.mediaFeature() == MediaFeatureNames::minWidth) {
>+                if (evaluateWidth(expression, Comparator::GreaterOrEqual))
>+                    result = true;
>+                continue;
>+            }
>+            if (expression.mediaFeature() == MediaFeatureNames::maxWidth) {
>+                if (evaluateWidth(expression, Comparator::LesserOrEqual))
>+                    result = true;
>+                continue;
>+            }
>+            if (expression.mediaFeature() == MediaFeatureNames::width) {
>+                if (evaluateWidth(expression, expression.value() ? Comparator::Equal : Comparator::True))
>+                    result = true;
>+                continue;
>+            }
>+            if (expression.mediaFeature() == MediaFeatureNames::minHeight) {
>+                if (evaluateHeight(expression, Comparator::GreaterOrEqual))
>+                    result = true;
>+                continue;
>+            }
>+            if (expression.mediaFeature() == MediaFeatureNames::maxHeight) {
>+                if (evaluateHeight(expression, Comparator::LesserOrEqual))
>+                    result = true;
>+                continue;
>+            }
>+            if (expression.mediaFeature() == MediaFeatureNames::height) {
>+                if (evaluateHeight(expression, expression.value() ? Comparator::Equal : Comparator::True))
>+                    result = true;
>+                continue;
>+            }
>+        }
>+    }
>+
>+    return result;
>+}
>+
>+}
>diff --git a/Source/WebCore/style/ContainerQueryEvaluator.h b/Source/WebCore/style/ContainerQueryEvaluator.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..d04159ee6f5d2c383a1970fca57425459def3d3d
>--- /dev/null
>+++ b/Source/WebCore/style/ContainerQueryEvaluator.h
>@@ -0,0 +1,44 @@
>+/*
>+ * Copyright (C) 2022 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  Redistributions in binary form must reproduce the above copyright
>+ *     notice, this list of conditions and the following disclaimer in the
>+ *     documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
>+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+namespace WebCore {
>+
>+class Element;
>+
>+namespace Style {
>+
>+class ContainerQueryEvaluator {
>+public:
>+    ContainerQueryEvaluator(const Vector<Ref<const Element>>& containers);
>+
>+    bool evaluate(const ContainerQuery&) const;
>+
>+private:
>+    const Vector<Ref<const Element>>& m_containers;
>+};
>+
>+}
>+}
>diff --git a/Source/WebCore/style/ElementRuleCollector.cpp b/Source/WebCore/style/ElementRuleCollector.cpp
>index ce6cce2966c8a75063b6bb37cf640508e2df1023..d0554d49bfba75adb99f5e02abc60338629c89fb 100644
>--- a/Source/WebCore/style/ElementRuleCollector.cpp
>+++ b/Source/WebCore/style/ElementRuleCollector.cpp
>@@ -32,6 +32,7 @@
> #include "CSSRuleList.h"
> #include "CSSSelector.h"
> #include "CSSValueKeywords.h"
>+#include "ContainerQueryEvaluator.h"
> #include "ElementInlines.h"
> #include "HTMLElement.h"
> #include "HTMLSlotElement.h"
>@@ -504,12 +505,13 @@ void ElementRuleCollector::collectMatchingRulesForList(const RuleSet::RuleDataVe
>     }
> }
> 
>-bool ElementRuleCollector::containerQueryMatches(const ContainerQuery&)
>+bool ElementRuleCollector::containerQueryMatches(const ContainerQuery& query)
> {
>     if (!m_selectorMatchingState)
>         return true;
>-    // FIXME: The actual matching.
>-    return !m_selectorMatchingState->queryContainers.isEmpty();
>+
>+    ContainerQueryEvaluator evaluator(m_selectorMatchingState->queryContainers);
>+    return evaluator.evaluate(query);
> }
> 
> static inline bool compareRules(MatchedRule r1, MatchedRule r2)
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 587b736eb1d4c1d5853565287bb2f9527d000ca9..77686306b41b3e792c2e1ccc55f158987e15ef10 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2022-02-07  Antti Koivisto  <antti@apple.com>
>+
>+        [CSS Container Queries] Add ContainerQueryEvaluator
>+        https://bugs.webkit.org/show_bug.cgi?id=236096
>+
>+        Reviewed by Darin Adler.
>+
>+        * TestExpectations:
>+
> 2022-02-03  Martin Robinson  <mrobinson@webkit.org>
> 
>         Transform interpolation should blend between shared transform function primitives
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index de776cc458132b2c88ab16e5be8077b8688ced67..049423cf7a78500ab713d8a6c92f724b56524a25 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,42 @@
>+2022-02-07  Antti Koivisto  <antti@apple.com>
>+
>+        [CSS Container Queries] Add ContainerQueryEvaluator
>+        https://bugs.webkit.org/show_bug.cgi?id=236096
>+
>+        Reviewed by Darin Adler.
>+
>+        * web-platform-tests/css/css-contain/container-queries/animation-container-type-dynamic-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/animation-nested-animation-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/animation-nested-transition-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/aspect-ratio-feature-evaluation-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/at-container-parsing-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/auto-scrollbars-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom.tentative-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/container-selection-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/container-size-invalidation-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/container-type-invalidation-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/display-contents-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/display-none-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/get-animations-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/iframe-invalidation-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/inline-size-containment-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/inline-size-containment-vertical-rl-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/orthogonal-wm-container-query-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/percentage-padding-orthogonal-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/query-content-box-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/query-evaluation-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/reattach-container-with-dirty-child-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/size-container-no-principal-box-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/size-feature-evaluation-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/top-layer-dialog-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/top-layer-nested-dialog-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/transition-scrollbars-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/unsupported-axis-expected.txt:
>+        * web-platform-tests/css/css-contain/container-queries/viewport-units-expected.txt:
>+
> 2022-02-03  Martin Robinson  <mrobinson@webkit.org>
> 
>         Transform interpolation should blend between shared transform function primitives
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 402466e49f0e206fa7cf74899298c10b530237e7..14062133ce882612c99bba831e67475acc35db24 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -4749,8 +4749,7 @@ imported/w3c/web-platform-tests/css/css-contain/contain-html-overflow-004.html [
> # Container queries
> webkit.org/b/229659 imported/w3c/web-platform-tests/css/css-contain/container-queries/display-in-container.html [ ImageOnlyFailure ]
> webkit.org/b/229659 imported/w3c/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002.tentative.html [ ImageOnlyFailure ]
>-webkit.org/b/229659 imported/w3c/web-platform-tests/css/css-contain/container-queries/inline-size-bfc-floats.html [ ImageOnlyFailure ]
>-webkit.org/b/229659 imported/w3c/web-platform-tests/css/css-contain/container-queries/whitespace-update-after-removal.html [ ImageOnlyFailure ]
>+webkit.org/b/229659 imported/w3c/web-platform-tests/css/css-contain/container-queries/multicol-inside-container.html [ ImageOnlyFailure ]
> 
> # Flaky css-contain test
> imported/w3c/web-platform-tests/css/css-contain/content-visibility/animation-display-lock.html [ Failure Pass ]
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-container-type-dynamic-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-container-type-dynamic-expected.txt
>index 5b50ee5981d7ae5328f5351f5ed7c23a23e5428a..f7c671870578ae3569417e2e40892f27ddf09edd 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-container-type-dynamic-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-container-type-dynamic-expected.txt
>@@ -1,4 +1,4 @@
> Test
> 
>-FAIL Animated container creating new container assert_equals: expected "rgb(0, 0, 255)" but got "rgb(0, 128, 0)"
>+FAIL Animated container creating new container assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 255)"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-nested-animation-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-nested-animation-expected.txt
>index caaf41d6bb64387c83e8d3ff3eb8aa4414893c5c..38864dd7c1198ccc8bb5450262d91cb6f3de3069 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-nested-animation-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-nested-animation-expected.txt
>@@ -1,4 +1,4 @@
> Test
> 
>-FAIL Animated container can create inner animation assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 255)"
>+FAIL Animated container can create inner animation assert_equals: expected "rgb(0, 0, 255)" but got "rgb(0, 128, 0)"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-nested-transition-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-nested-transition-expected.txt
>index 05f7b4c7ee48066606b0ceb7be95225f6055f008..c7326ea1db9711a632aae1b1c471adff8fb627f1 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-nested-transition-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/animation-nested-transition-expected.txt
>@@ -1,4 +1,4 @@
> Test
> 
>-FAIL Animated container size triggers transition assert_equals: expected "rgb(100, 100, 100)" but got "rgb(200, 200, 200)"
>+FAIL Animated container size triggers transition assert_equals: expected "rgb(150, 150, 150)" but got "rgb(100, 100, 100)"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/aspect-ratio-feature-evaluation-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/aspect-ratio-feature-evaluation-expected.txt
>index 7958d251fa9b6a35f98756aaa330264e2cdfa1a1..b8dbfd55399844dcd8c0719fab402a7bdcb3ba0b 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/aspect-ratio-feature-evaluation-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/aspect-ratio-feature-evaluation-expected.txt
>@@ -1,4 +1,4 @@
> 
>-FAIL @container queries with aspect-ratio and size containment assert_equals: Should not match for inline-size containment expected "rgb(255, 0, 0)" but got "rgb(0, 128, 0)"
>-PASS @container query with aspect-ratio change after resize
>+FAIL @container queries with aspect-ratio and size containment assert_equals: Should match for block-size containment expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
>+FAIL @container query with aspect-ratio change after resize assert_equals: Should match 2/1 min-ratio expected "rgb(0, 255, 0)" but got "rgba(0, 0, 0, 0)"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/at-container-parsing-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/at-container-parsing-expected.txt
>index 6e17f893da31e21724f31f95f90d61cd2c607eb2..502b9f76673f4e962a46319c36128550f3030123 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/at-container-parsing-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/at-container-parsing-expected.txt
>@@ -1,38 +1,38 @@
> 
>-PASS size(width)
>-PASS size(min-width: 0px)
>-PASS size(max-width: 0px)
>-PASS size(height)
>-PASS size(min-height: 0px)
>-PASS size(max-height: 0px)
>-PASS size(aspect-ratio)
>-PASS size(min-aspect-ratio: 1/2)
>-PASS size(max-aspect-ratio: 1/2)
>-PASS size(orientation: portrait)
>-PASS size(inline-size)
>-PASS size(min-inline-size: 0px)
>-PASS size(max-inline-size: 0px)
>-PASS size(block-size)
>-PASS size(min-block-size: 0px)
>-PASS size(max-block-size: 0px)
>-PASS size(width: 100px)
>-PASS size((width: 100px))
>-PASS size(not (width: 100px))
>-PASS size((width: 100px) and (height: 100px))
>-PASS size((width: 50px) or (height: 100px))
>-PASS size(width < 100px)
>-PASS size(100px < width)
>-PASS size(100px < width < 200px)
>-FAIL foo(width) assert_equals: expected "" but got "true"
>-FAIL size(asdf) assert_equals: expected "" but got "true"
>-FAIL size(resolution > 100dpi) assert_equals: expected "" but got "true"
>-FAIL size(resolution: 150dpi) assert_equals: expected "" but got "true"
>-FAIL size(color) assert_equals: expected "" but got "true"
>-FAIL size(min-color: 1) assert_equals: expected "" but got "true"
>-FAIL size(color-index >= 1) assert_equals: expected "" but got "true"
>-FAIL (color-index >= 1) assert_equals: expected "" but got "true"
>-FAIL size(grid) assert_equals: expected "" but got "true"
>-FAIL (grid) assert_equals: expected "" but got "true"
>+FAIL size(width) assert_equals: expected "true" but got ""
>+FAIL size(min-width: 0px) assert_equals: expected "true" but got ""
>+FAIL size(max-width: 0px) assert_equals: expected "true" but got ""
>+FAIL size(height) assert_equals: expected "true" but got ""
>+FAIL size(min-height: 0px) assert_equals: expected "true" but got ""
>+FAIL size(max-height: 0px) assert_equals: expected "true" but got ""
>+FAIL size(aspect-ratio) assert_equals: expected "true" but got ""
>+FAIL size(min-aspect-ratio: 1/2) assert_equals: expected "true" but got ""
>+FAIL size(max-aspect-ratio: 1/2) assert_equals: expected "true" but got ""
>+FAIL size(orientation: portrait) assert_equals: expected "true" but got ""
>+FAIL size(inline-size) assert_equals: expected "true" but got ""
>+FAIL size(min-inline-size: 0px) assert_equals: expected "true" but got ""
>+FAIL size(max-inline-size: 0px) assert_equals: expected "true" but got ""
>+FAIL size(block-size) assert_equals: expected "true" but got ""
>+FAIL size(min-block-size: 0px) assert_equals: expected "true" but got ""
>+FAIL size(max-block-size: 0px) assert_equals: expected "true" but got ""
>+FAIL size(width: 100px) assert_equals: expected "true" but got ""
>+FAIL size((width: 100px)) assert_equals: expected "true" but got ""
>+FAIL size(not (width: 100px)) assert_equals: expected "true" but got ""
>+FAIL size((width: 100px) and (height: 100px)) assert_equals: expected "true" but got ""
>+FAIL size((width: 50px) or (height: 100px)) assert_equals: expected "true" but got ""
>+FAIL size(width < 100px) assert_equals: expected "true" but got ""
>+FAIL size(100px < width) assert_equals: expected "true" but got ""
>+FAIL size(100px < width < 200px) assert_equals: expected "true" but got ""
>+PASS foo(width)
>+PASS size(asdf)
>+PASS size(resolution > 100dpi)
>+PASS size(resolution: 150dpi)
>+PASS size(color)
>+PASS size(min-color: 1)
>+PASS size(color-index >= 1)
>+PASS (color-index >= 1)
>+PASS size(grid)
>+PASS (grid)
> PASS screen
> PASS print
> PASS not print
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/auto-scrollbars-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/auto-scrollbars-expected.txt
>index ff64b2fdf6a5b895ad03e474356d5cc3030f6079..6a2d1a2586f7e714ab99aeea204529427ee795fd 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/auto-scrollbars-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/auto-scrollbars-expected.txt
>@@ -1,4 +1,4 @@
> 
>-FAIL Initial layout - expecting a scrollbar without overflowing content instead of overflowing content without a scrollbar assert_less_than: Expects a vertical scrollbar expected a number less than 100 but got 100
>+FAIL Initial layout - expecting a scrollbar without overflowing content instead of overflowing content without a scrollbar assert_equals: Layout with a scrollbar means the container query applies expected "50px" but got "100px"
> FAIL Same result after a reflow assert_less_than: Expects a vertical scrollbar expected a number less than 100 but got 100
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom.tentative-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom.tentative-expected.txt
>index e376a2c0920ef13c53bcd3a81bc090d50492a5b5..d81ef243564bc251c04aabf94e2acf0f455a80a7 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom.tentative-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom.tentative-expected.txt
>@@ -1,6 +1,6 @@
> 
> FAIL Match container in outer tree null is not an object (evaluating 'document.querySelector("#inclusive-ancestor-across-root > div").shadowRoot.querySelector')
>-PASS Match container in same tree, not walking flat tree ancestors
>+FAIL Match container in same tree, not walking flat tree ancestors assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
> FAIL Match container in ::slotted selector's originating element tree assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
> FAIL Match container in outer tree for :host assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
> FAIL Match container in ::part selector's originating element tree null is not an object (evaluating 'document.querySelector("#inclusive-ancestor-part > div").shadowRoot.querySelector')
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt
>index 73994066962cb402705a3c6dbf5dde102e53d7eb..2d00a4d8b05a413e0c2454e5250391a3f75cb744 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt
>@@ -1,5 +1,5 @@
> Test
> 
>-FAIL Changing a named container invalidates relevant descendants assert_equals: expected "rgb(0, 0, 0)" but got "rgb(0, 128, 0)"
>-FAIL Changing container-name invalidates relevant descendants assert_equals: expected "rgb(0, 0, 0)" but got "rgb(0, 128, 0)"
>+FAIL Changing a named container invalidates relevant descendants assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
>+FAIL Changing container-name invalidates relevant descendants assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-selection-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-selection-expected.txt
>index a3b7185be638275e075198bad4f23c75e453001e..0b136dfd51d8d8cff826e1426337e9601b0eb831 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-selection-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-selection-expected.txt
>@@ -3,25 +3,25 @@ PASS size(width: 16px) for .size > .inline > span
> PASS size(height: 16px) for .inline > .size > span
> PASS size(width: 16px) for .inline > .size > span
> FAIL size(height) for .size > .inline > span assert_equals: expected "" but got "true"
>-PASS type(inline-size) size(width: 16px) for .inline > .size > span
>-PASS type(inline-size) size(width: 16px) for .size > .inline > span
>-PASS type(size) size(height: 16px) for .inline > .size > span
>-PASS type(size) size(height: 32px) for .size > .inline > span
>-FAIL type(size) size(height) for .inline > .inline > span assert_equals: expected "" but got "true"
>-PASS name(a) size(width: 32px) for .a-size > .b-size > span
>-PASS name(b) size(width: 16px) for .a-size > .b-size > span
>-FAIL name(c) size(width) for .a-size > .b-size > span assert_equals: expected "" but got "true"
>-PASS name(a) size(width: 16px) for .a-size > .a-size > span
>-PASS a size(width: 32px) for .a-size > .b-size > span
>+FAIL type(inline-size) size(width: 16px) for .inline > .size > span assert_equals: expected "true" but got ""
>+FAIL type(inline-size) size(width: 16px) for .size > .inline > span assert_equals: expected "true" but got ""
>+FAIL type(size) size(height: 16px) for .inline > .size > span assert_equals: expected "true" but got ""
>+FAIL type(size) size(height: 32px) for .size > .inline > span assert_equals: expected "true" but got ""
>+PASS type(size) size(height) for .inline > .inline > span
>+FAIL name(a) size(width: 32px) for .a-size > .b-size > span assert_equals: expected "true" but got ""
>+FAIL name(b) size(width: 16px) for .a-size > .b-size > span assert_equals: expected "true" but got ""
>+PASS name(c) size(width) for .a-size > .b-size > span
>+FAIL name(a) size(width: 16px) for .a-size > .a-size > span assert_equals: expected "true" but got ""
>+FAIL a size(width: 32px) for .a-size > .b-size > span assert_equals: expected "true" but got ""
> PASS b size(width: 16px) for .a-size > .b-size > span
> FAIL c size(width) for .a-size > .b-size > span assert_equals: expected "" but got "true"
> PASS a size(width: 16px) for .a-size > .a-size > span
> PASS a size(width: 32px) for .a-size > .a > span
>-PASS name(a) type(inline-size) size(width: 8px) for .a-size > .b-size > .a-inline > span
>-PASS name(b) type(inline-size) size(width: 16px) for .a-size > .b-size > .a-inline > span
>-PASS name(a) type(size) size(width: 32px) for .a-size > .b-size > .a-inline > span
>-PASS name(b) type(size) size(width: 16px) for .a-size > .b-size > .a-inline > span
>+FAIL name(a) type(inline-size) size(width: 8px) for .a-size > .b-size > .a-inline > span assert_equals: expected "true" but got ""
>+FAIL name(b) type(inline-size) size(width: 16px) for .a-size > .b-size > .a-inline > span assert_equals: expected "true" but got ""
>+FAIL name(a) type(size) size(width: 32px) for .a-size > .b-size > .a-inline > span assert_equals: expected "true" but got ""
>+FAIL name(b) type(size) size(width: 16px) for .a-size > .b-size > .a-inline > span assert_equals: expected "true" but got ""
> PASS name(a) type(size) size(width) for .a-inline > .b-size
>-PASS type(inline-size) name(a) size(width: 8px) for .a-size > .b-size > .a-inline > span
>-PASS type(size) name(a) size(height: 32px) for .a-size > .b-size > .a-inline > span
>+FAIL type(inline-size) name(a) size(width: 8px) for .a-size > .b-size > .a-inline > span assert_equals: expected "true" but got ""
>+FAIL type(size) name(a) size(height: 32px) for .a-size > .b-size > .a-inline > span assert_equals: expected "true" but got ""
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-size-invalidation-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-size-invalidation-expected.txt
>index 0c0cdf40e2f5a9f55da9bdff5e2a5f9f8c7fd0c2..c4101f03673bf804610680ef13500088d66a4c19 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-size-invalidation-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-size-invalidation-expected.txt
>@@ -2,6 +2,6 @@ Test
> Deep
> 
> 
>-FAIL Children respond to changes in container size assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 128, 0)"
>-FAIL Descendants respond to changes in container size assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 128, 0)"
>+PASS Children respond to changes in container size
>+PASS Descendants respond to changes in container size
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-type-invalidation-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-type-invalidation-expected.txt
>index 7e1fbf1d22ca2b2b95f2ddef687258f9af058389..c351c237c78dcbf4f8e8f43ff942cc0cf9abb6a9 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-type-invalidation-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-type-invalidation-expected.txt
>@@ -1,4 +1,4 @@
> Test
> 
>-FAIL Changing the container type invalidates relevant descendants assert_equals: expected "rgb(0, 0, 0)" but got "rgb(0, 128, 0)"
>+FAIL Changing the container type invalidates relevant descendants assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/display-contents-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/display-contents-expected.txt
>index b8731fb0c4321e09f8ba0b6af9b49172264d61d3..06ae750cedebb15ed83513d26618bec345835d1e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/display-contents-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/display-contents-expected.txt
>@@ -1,5 +1,5 @@
> 
> FAIL getComputedStyle when container is display:contents assert_equals: expected "" but got "50"
>-FAIL getComputedStyle when container becomes display:contents assert_equals: expected "30" but got "50"
>-FAIL getComputedStyle when intermediate container becomes display:contents assert_equals: expected "30" but got "50"
>+FAIL getComputedStyle when container becomes display:contents assert_equals: expected "" but got "50"
>+FAIL getComputedStyle when intermediate container becomes display:contents assert_equals: expected "" but got "50"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/display-none-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/display-none-expected.txt
>index d1fc68efb66e9807e5172f38cff36209373262b8..da7e8b860cef273a4cc7325c7ef02b573114746a 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/display-none-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/display-none-expected.txt
>@@ -10,9 +10,9 @@ FAIL getComputedStyle when outer container is display:none assert_equals: expect
> FAIL getComputedStyle when element becomes display:none assert_equals: expected "30" but got "50"
> FAIL getComputedStyle when parent becomes display:none assert_equals: expected "30" but got "50"
> FAIL getComputedStyle when ancestor becomes display:none assert_equals: expected "30" but got "50"
>-FAIL getComputedStyle when container becomes display:none assert_equals: expected "30" but got "50"
>-FAIL getComputedStyle when intermediate container becomes display:none assert_equals: expected "30" but got "50"
>-FAIL getComputedStyle when ::before is display:none assert_equals: expected "30" but got "50"
>+FAIL getComputedStyle when container becomes display:none assert_equals: expected "" but got "50"
>+FAIL getComputedStyle when intermediate container becomes display:none assert_equals: expected "" but got "50"
>+PASS getComputedStyle when ::before is display:none
> FAIL getComputedStyle when originating element is display:none assert_equals: expected "30" but got "50"
> FAIL getComputedStyle on ::before when ancestor element is display:none assert_equals: expected "30" but got "50"
> FAIL getComputedStyle on ::before when container is display:none assert_equals: expected "" but got "50"
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt
>index 1f592fb8ae8784800e2c05e2ecce90ebbbbb63d7..d2fe88af2c2cad4e8b93ca6a11a25dd21741c0b9 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic-expected.txt
>@@ -1,10 +1,10 @@
> 
>-FAIL em relative before change assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 128, 0)"
>-FAIL rem relative before change assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 128, 0)"
>-FAIL ex relative before change assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 128, 0)"
>-FAIL ch relative before change assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 128, 0)"
>+PASS em relative before change
>+PASS rem relative before change
>+PASS ex relative before change
>+PASS ch relative before change
> PASS em relative after change
>-PASS rem relative after change
>+FAIL rem relative after change assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
> PASS ex relative after change
> PASS ch relative after change
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt
>index 0a090197385d062b44f62d49d4d4c0036584f7de..821dd79e1c571e91abf7d160ae71398ef4433c1a 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/font-relative-units-expected.txt
>@@ -1,6 +1,6 @@
> 
> PASS em relative inline-size
>-PASS rem relative inline-size
>+FAIL rem relative inline-size assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
> PASS ex relative inline-size
> PASS ch relative inline-size
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/get-animations-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/get-animations-expected.txt
>index cf12285f6d0866f9b725361fb40267cc5850c98f..0101397975733a0103e1a682d64f2c295e3b87db 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/get-animations-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/get-animations-expected.txt
>@@ -1,4 +1,4 @@
> Green
> 
>-FAIL Calling getAnimations updates layout of parent frame if needed assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 128, 0)"
>+PASS Calling getAnimations updates layout of parent frame if needed
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/iframe-invalidation-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/iframe-invalidation-expected.txt
>index 2a834d47d35ca31219a91768f06668e885b0f282..4fb193e0760673df0a06173d263e7c0c4da241f0 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/iframe-invalidation-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/iframe-invalidation-expected.txt
>@@ -1,4 +1,4 @@
> 
> 
>-FAIL @container-dependent elements respond to iframe size changes assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 128, 0)"
>+FAIL @container-dependent elements respond to iframe size changes assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/inline-size-containment-vertical-rl-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/inline-size-containment-vertical-rl-expected.txt
>index 4e475a691fd06bdcd5c8be9c57d8bb61c4873f1d..b6bd9331c5dfdef61a5ab86e1ad68864cbb7ddd8 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/inline-size-containment-vertical-rl-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/inline-size-containment-vertical-rl-expected.txt
>@@ -1,3 +1,3 @@
> 
>-FAIL inline-size containment only assert_equals: expected 400 but got 20
>+FAIL inline-size containment only assert_equals: expected 50 but got 400
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/orthogonal-wm-container-query-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/orthogonal-wm-container-query-expected.txt
>index 795eb9db1c8bc8bf67151bdf16a11de5a857228d..061b05063f34ad1650350697be5ff0a07b6697a3 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/orthogonal-wm-container-query-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/orthogonal-wm-container-query-expected.txt
>@@ -1,5 +1,5 @@
> XX
> 
>-FAIL Initial non-orthogonal width assert_equals: expected 400 but got 50
>+PASS Initial non-orthogonal width
> PASS Orthogonal width
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/percentage-padding-orthogonal-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/percentage-padding-orthogonal-expected.txt
>index 5efb0cf65109c120ac78a4c4136517ecd4090612..8d7cbb8996fd8180b0085ff1166e804fbb07fd8b 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/percentage-padding-orthogonal-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/percentage-padding-orthogonal-expected.txt
>@@ -1,8 +1,8 @@
> 
> FAIL #container height measured with 500px width. Both container children visible assert_equals: expected 100 but got 0
> FAIL #container width 400px after padding is applied. assert_equals: expected 400 but got 500
>-PASS #container width 400px after padding is applied. #second is removed from the rendering
>+FAIL #container width 400px after padding is applied. #second is removed from the rendering assert_equals: expected 50 but got 100
> FAIL #container height measured with 499px width. Both container children visible assert_equals: expected 100 but got 0
> FAIL #container width 399px after padding is applied. #second is removed from the rendering assert_equals: expected 399 but got 500
>-PASS #container width 399x after padding is applied. #second is removed from the rendering
>+FAIL #container width 399x after padding is applied. #second is removed from the rendering assert_equals: expected 50 but got 100
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/query-content-box-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/query-content-box-expected.txt
>index ddfa70609920025e10d4723b009176cb1f18af9c..64030a5363813e22156a86164c7b2104e5d39d4a 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/query-content-box-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/query-content-box-expected.txt
>@@ -1,6 +1,6 @@
> 
>-PASS Size queries with content-box sizing
>-PASS Size queries with border-box sizing
>-PASS Size queries with content-box sizing and overflow:scroll
>-PASS Size queries with border-box sizing and overflow:scroll
>+FAIL Size queries with content-box sizing assert_equals: expected "rgb(0, 128, 0)" but got "rgba(0, 0, 0, 0)"
>+FAIL Size queries with border-box sizing assert_equals: expected "rgb(0, 128, 0)" but got "rgba(0, 0, 0, 0)"
>+FAIL Size queries with content-box sizing and overflow:scroll assert_equals: expected "rgb(0, 128, 0)" but got "rgba(0, 0, 0, 0)"
>+FAIL Size queries with border-box sizing and overflow:scroll assert_equals: expected "rgb(0, 128, 0)" but got "rgba(0, 0, 0, 0)"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/query-evaluation-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/query-evaluation-expected.txt
>index 8001cd7026dfd190c3de522ba40fe7260f4b8add..9b1cb36ac5e1fd2706bac785126afde90869ef1b 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/query-evaluation-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/query-evaluation-expected.txt
>@@ -1,71 +1,71 @@
> 
> PASS size(width)
>-FAIL size(height) assert_equals: expected "false" but got "true"
>-FAIL size(unknown) assert_equals: expected "false" but got "true"
>-FAIL unknown(width) assert_equals: expected "false" but got "true"
>-PASS (size(width))
>-FAIL (size(height)) assert_equals: expected "false" but got "true"
>-FAIL (size(unknown)) assert_equals: expected "false" but got "true"
>-PASS (((size(width))))
>-FAIL (((size(height)))) assert_equals: expected "false" but got "true"
>-FAIL (((size(unknown)))) assert_equals: expected "false" but got "true"
>-FAIL (not size(width)) assert_equals: expected "false" but got "true"
>-PASS (not size(height))
>-FAIL (not size(unknown)) assert_equals: expected "false" but got "true"
>-FAIL (not unknown(width)) assert_equals: expected "false" but got "true"
>-PASS (size(width) and size(width))
>-PASS (size(width) and size(width) and size(width))
>-FAIL (size(height) and size(height)) assert_equals: expected "false" but got "true"
>-FAIL (size(height) and size(width) and size(width)) assert_equals: expected "false" but got "true"
>-FAIL (size(width) and size(height) and size(width)) assert_equals: expected "false" but got "true"
>-FAIL (size(width) and size(width) and size(height)) assert_equals: expected "false" but got "true"
>-FAIL (size(unknown) and size(width) and size(width)) assert_equals: expected "false" but got "true"
>-FAIL (size(width) and size(unknown) and size(width)) assert_equals: expected "false" but got "true"
>-FAIL (size(width) and size(width) and size(unknown)) assert_equals: expected "false" but got "true"
>-PASS (size(width) or size(width))
>-PASS (size(width) or size(width) or size(width))
>-FAIL (size(height) or size(height)) assert_equals: expected "false" but got "true"
>-PASS (size(height) or size(width) or size(width))
>-PASS (size(width) or size(height) or size(width))
>-PASS (size(width) or size(width) or size(height))
>-PASS (size(unknown) or size(width) or size(width))
>-PASS (size(width) or size(unknown) or size(width))
>-PASS (size(width) or size(width) or size(unknown))
>-PASS (size(unknown) or size(height) or size(width))
>-FAIL (not (size(width) and size(width))) assert_equals: expected "false" but got "true"
>-PASS (not (size(width) and size(height)))
>-FAIL (size(width) and (not (size(height) or size(width)))) assert_equals: expected "false" but got "true"
>-PASS (size(height) or (not (size(height) and size(width))))
>-FAIL (size(height) or (size(height) and size(width))) assert_equals: expected "false" but got "true"
>-PASS size((width))
>-FAIL size((height)) assert_equals: expected "false" but got "true"
>-FAIL size((unknown)) assert_equals: expected "false" but got "true"
>-FAIL unknown((width)) assert_equals: expected "false" but got "true"
>-FAIL size(not (width)) assert_equals: expected "false" but got "true"
>-PASS size(not (height))
>-FAIL size(not (unknown)) assert_equals: expected "false" but got "true"
>-PASS size((width) and (width))
>-PASS size((width) and (width) and (width))
>-FAIL size((height) and (height)) assert_equals: expected "false" but got "true"
>-FAIL size((height) and (width) and (width)) assert_equals: expected "false" but got "true"
>-FAIL size((width) and (height) and (width)) assert_equals: expected "false" but got "true"
>-FAIL size((width) and (width) and (height)) assert_equals: expected "false" but got "true"
>-FAIL size((unknown) and (width) and (width)) assert_equals: expected "false" but got "true"
>-FAIL size((width) and (unknown) and (width)) assert_equals: expected "false" but got "true"
>-FAIL size((width) and (width) and (unknown)) assert_equals: expected "false" but got "true"
>-PASS size((width) or (width))
>-PASS size((width) or (width) or (width))
>-FAIL size((height) or (height)) assert_equals: expected "false" but got "true"
>-PASS size((height) or (width) or (width))
>-PASS size((width) or (height) or (width))
>-PASS size((width) or (width) or (height))
>-PASS size((unknown) or (width) or (width))
>-PASS size((width) or (unknown) or (width))
>-PASS size((width) or (width) or (unknown))
>-PASS size((unknown) or (height) or (width))
>-FAIL size(not ((width) and (width))) assert_equals: expected "false" but got "true"
>-PASS size(not ((width) and (height)))
>-FAIL size((width) and (not ((height) or (width)))) assert_equals: expected "false" but got "true"
>-PASS size((height) or (not ((height) and (width))))
>-FAIL size((height) or ((height) and (width))) assert_equals: expected "false" but got "true"
>+PASS size(height)
>+PASS size(unknown)
>+PASS unknown(width)
>+FAIL (size(width)) assert_equals: expected "true" but got "false"
>+PASS (size(height))
>+PASS (size(unknown))
>+FAIL (((size(width)))) assert_equals: expected "true" but got "false"
>+PASS (((size(height))))
>+PASS (((size(unknown))))
>+PASS (not size(width))
>+FAIL (not size(height)) assert_equals: expected "true" but got "false"
>+PASS (not size(unknown))
>+PASS (not unknown(width))
>+FAIL (size(width) and size(width)) assert_equals: expected "true" but got "false"
>+FAIL (size(width) and size(width) and size(width)) assert_equals: expected "true" but got "false"
>+PASS (size(height) and size(height))
>+PASS (size(height) and size(width) and size(width))
>+PASS (size(width) and size(height) and size(width))
>+PASS (size(width) and size(width) and size(height))
>+PASS (size(unknown) and size(width) and size(width))
>+PASS (size(width) and size(unknown) and size(width))
>+PASS (size(width) and size(width) and size(unknown))
>+FAIL (size(width) or size(width)) assert_equals: expected "true" but got "false"
>+FAIL (size(width) or size(width) or size(width)) assert_equals: expected "true" but got "false"
>+PASS (size(height) or size(height))
>+FAIL (size(height) or size(width) or size(width)) assert_equals: expected "true" but got "false"
>+FAIL (size(width) or size(height) or size(width)) assert_equals: expected "true" but got "false"
>+FAIL (size(width) or size(width) or size(height)) assert_equals: expected "true" but got "false"
>+FAIL (size(unknown) or size(width) or size(width)) assert_equals: expected "true" but got "false"
>+FAIL (size(width) or size(unknown) or size(width)) assert_equals: expected "true" but got "false"
>+FAIL (size(width) or size(width) or size(unknown)) assert_equals: expected "true" but got "false"
>+FAIL (size(unknown) or size(height) or size(width)) assert_equals: expected "true" but got "false"
>+PASS (not (size(width) and size(width)))
>+FAIL (not (size(width) and size(height))) assert_equals: expected "true" but got "false"
>+PASS (size(width) and (not (size(height) or size(width))))
>+FAIL (size(height) or (not (size(height) and size(width)))) assert_equals: expected "true" but got "false"
>+PASS (size(height) or (size(height) and size(width)))
>+FAIL size((width)) assert_equals: expected "true" but got "false"
>+PASS size((height))
>+PASS size((unknown))
>+PASS unknown((width))
>+PASS size(not (width))
>+FAIL size(not (height)) assert_equals: expected "true" but got "false"
>+PASS size(not (unknown))
>+FAIL size((width) and (width)) assert_equals: expected "true" but got "false"
>+FAIL size((width) and (width) and (width)) assert_equals: expected "true" but got "false"
>+PASS size((height) and (height))
>+PASS size((height) and (width) and (width))
>+PASS size((width) and (height) and (width))
>+PASS size((width) and (width) and (height))
>+PASS size((unknown) and (width) and (width))
>+PASS size((width) and (unknown) and (width))
>+PASS size((width) and (width) and (unknown))
>+FAIL size((width) or (width)) assert_equals: expected "true" but got "false"
>+FAIL size((width) or (width) or (width)) assert_equals: expected "true" but got "false"
>+PASS size((height) or (height))
>+FAIL size((height) or (width) or (width)) assert_equals: expected "true" but got "false"
>+FAIL size((width) or (height) or (width)) assert_equals: expected "true" but got "false"
>+FAIL size((width) or (width) or (height)) assert_equals: expected "true" but got "false"
>+FAIL size((unknown) or (width) or (width)) assert_equals: expected "true" but got "false"
>+FAIL size((width) or (unknown) or (width)) assert_equals: expected "true" but got "false"
>+FAIL size((width) or (width) or (unknown)) assert_equals: expected "true" but got "false"
>+FAIL size((unknown) or (height) or (width)) assert_equals: expected "true" but got "false"
>+PASS size(not ((width) and (width)))
>+FAIL size(not ((width) and (height))) assert_equals: expected "true" but got "false"
>+PASS size((width) and (not ((height) or (width))))
>+FAIL size((height) or (not ((height) and (width)))) assert_equals: expected "true" but got "false"
>+PASS size((height) or ((height) and (width)))
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/reattach-container-with-dirty-child-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/reattach-container-with-dirty-child-expected.txt
>index 3b89a9567864bd094236658f8487aa110428d639..332b12433cbfcd112d001082c1d1c470dace5212 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/reattach-container-with-dirty-child-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/reattach-container-with-dirty-child-expected.txt
>@@ -1,5 +1,5 @@
> XXX
> 
>-FAIL Initially wider than 200px assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 255, 0)"
>+PASS Initially wider than 200px
> PASS Container query changed and inner.style applied
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/size-container-no-principal-box-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/size-container-no-principal-box-expected.txt
>index 2c0e324c976940be488a8ab514680742561a3c64..6026a7fbc3a0137c33311536490ab0a3b71e325e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/size-container-no-principal-box-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/size-container-no-principal-box-expected.txt
>@@ -1,5 +1,5 @@
> 
> PASS Check that container queries is supported
> FAIL (min-width: 0) does not match a container without a principal box (display:none) assert_equals: expected "rgb(0, 0, 0)" but got "rgb(255, 0, 0)"
>-FAIL (min-width: 0) does not match a container without a principal box (display:contents) assert_equals: expected "rgb(0, 0, 0)" but got "rgb(255, 0, 0)"
>+PASS (min-width: 0) does not match a container without a principal box (display:contents)
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/size-feature-evaluation-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/size-feature-evaluation-expected.txt
>index 0a88879936bb029353fa66a2d2dc27676a4338be..c2f2d69aab240a0d13009b02451356f1d92c47c4 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/size-feature-evaluation-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/size-feature-evaluation-expected.txt
>@@ -1,59 +1,59 @@
> Test
> 
>-FAIL size(width < 100px) (.horizontal) assert_equals: expected "" but got "true"
>-PASS size(width >= 100px) (.horizontal)
>+PASS size(width < 100px) (.horizontal)
>+FAIL size(width >= 100px) (.horizontal) assert_equals: expected "true" but got ""
> PASS size(min-width: 100px) (.horizontal)
>-FAIL size(min-width: 101px) (.horizontal) assert_equals: expected "" but got "true"
>+PASS size(min-width: 101px) (.horizontal)
> PASS size(max-width: 100px) (.horizontal)
>-FAIL size(max-width: 99px) (.horizontal) assert_equals: expected "" but got "true"
>-FAIL size(height < 200px) (.horizontal) assert_equals: expected "" but got "true"
>-PASS size(height >= 200px) (.horizontal)
>+PASS size(max-width: 99px) (.horizontal)
>+PASS size(height < 200px) (.horizontal)
>+FAIL size(height >= 200px) (.horizontal) assert_equals: expected "true" but got ""
> PASS size(min-height: 200px) (.horizontal)
>-FAIL size(min-height: 201px) (.horizontal) assert_equals: expected "" but got "true"
>+PASS size(min-height: 201px) (.horizontal)
> PASS size(max-height: 200px) (.horizontal)
>-FAIL size(max-height: 199px) (.horizontal) assert_equals: expected "" but got "true"
>-FAIL size(inline-size < 100px) (.horizontal) assert_equals: expected "" but got "true"
>-PASS size(inline-size >= 100px) (.horizontal)
>-PASS size(min-inline-size: 100px) (.horizontal)
>-FAIL size(min-inline-size: 101px) (.horizontal) assert_equals: expected "" but got "true"
>-PASS size(max-inline-size: 100px) (.horizontal)
>-FAIL size(max-inline-size: 99px) (.horizontal) assert_equals: expected "" but got "true"
>-FAIL size(block-size < 200px) (.horizontal) assert_equals: expected "" but got "true"
>-PASS size(block-size >= 200px) (.horizontal)
>-PASS size(min-block-size: 200px) (.horizontal)
>-FAIL size(min-block-size: 201px) (.horizontal) assert_equals: expected "" but got "true"
>-PASS size(max-block-size: 200px) (.horizontal)
>-FAIL size(max-block-size: 199px) (.horizontal) assert_equals: expected "" but got "true"
>-FAIL size(orientation: landscape) (.horizontal) assert_equals: expected "" but got "true"
>-PASS size(orientation: portrait) (.horizontal)
>-PASS size(aspect-ratio: 1/2) (.horizontal)
>-FAIL size(aspect-ratio: 2/1) (.horizontal) assert_equals: expected "" but got "true"
>-FAIL size(width < 100px) (.vertical) assert_equals: expected "" but got "true"
>-PASS size(width >= 100px) (.vertical)
>+PASS size(max-height: 199px) (.horizontal)
>+PASS size(inline-size < 100px) (.horizontal)
>+FAIL size(inline-size >= 100px) (.horizontal) assert_equals: expected "true" but got ""
>+FAIL size(min-inline-size: 100px) (.horizontal) assert_equals: expected "true" but got ""
>+PASS size(min-inline-size: 101px) (.horizontal)
>+FAIL size(max-inline-size: 100px) (.horizontal) assert_equals: expected "true" but got ""
>+PASS size(max-inline-size: 99px) (.horizontal)
>+PASS size(block-size < 200px) (.horizontal)
>+FAIL size(block-size >= 200px) (.horizontal) assert_equals: expected "true" but got ""
>+FAIL size(min-block-size: 200px) (.horizontal) assert_equals: expected "true" but got ""
>+PASS size(min-block-size: 201px) (.horizontal)
>+FAIL size(max-block-size: 200px) (.horizontal) assert_equals: expected "true" but got ""
>+PASS size(max-block-size: 199px) (.horizontal)
>+PASS size(orientation: landscape) (.horizontal)
>+FAIL size(orientation: portrait) (.horizontal) assert_equals: expected "true" but got ""
>+FAIL size(aspect-ratio: 1/2) (.horizontal) assert_equals: expected "true" but got ""
>+PASS size(aspect-ratio: 2/1) (.horizontal)
>+PASS size(width < 100px) (.vertical)
>+FAIL size(width >= 100px) (.vertical) assert_equals: expected "true" but got ""
> PASS size(min-width: 100px) (.vertical)
>-FAIL size(min-width: 101px) (.vertical) assert_equals: expected "" but got "true"
>+PASS size(min-width: 101px) (.vertical)
> PASS size(max-width: 100px) (.vertical)
>-FAIL size(max-width: 99px) (.vertical) assert_equals: expected "" but got "true"
>-FAIL size(height < 200px) (.vertical) assert_equals: expected "" but got "true"
>-PASS size(height >= 200px) (.vertical)
>+PASS size(max-width: 99px) (.vertical)
>+PASS size(height < 200px) (.vertical)
>+FAIL size(height >= 200px) (.vertical) assert_equals: expected "true" but got ""
> PASS size(min-height: 200px) (.vertical)
>-FAIL size(min-height: 201px) (.vertical) assert_equals: expected "" but got "true"
>+PASS size(min-height: 201px) (.vertical)
> PASS size(max-height: 200px) (.vertical)
>-FAIL size(max-height: 199px) (.vertical) assert_equals: expected "" but got "true"
>-FAIL size(block-size < 100px) (.vertical) assert_equals: expected "" but got "true"
>-PASS size(block-size >= 100px) (.vertical)
>-PASS size(min-block-size: 100px) (.vertical)
>-FAIL size(min-block-size: 101px) (.vertical) assert_equals: expected "" but got "true"
>-PASS size(max-block-size: 100px) (.vertical)
>-FAIL size(max-block-size: 99px) (.vertical) assert_equals: expected "" but got "true"
>-FAIL size(inline-size < 200px) (.vertical) assert_equals: expected "" but got "true"
>-PASS size(inline-size >= 200px) (.vertical)
>-PASS size(min-inline-size: 200px) (.vertical)
>-FAIL size(min-inline-size: 201px) (.vertical) assert_equals: expected "" but got "true"
>-PASS size(max-inline-size: 200px) (.vertical)
>-FAIL size(max-inline-size: 199px) (.vertical) assert_equals: expected "" but got "true"
>-FAIL size(orientation: landscape) (.vertical) assert_equals: expected "" but got "true"
>-PASS size(orientation: portrait) (.vertical)
>-PASS size(aspect-ratio: 1/2) (.vertical)
>-FAIL size(aspect-ratio: 2/1) (.vertical) assert_equals: expected "" but got "true"
>+PASS size(max-height: 199px) (.vertical)
>+PASS size(block-size < 100px) (.vertical)
>+FAIL size(block-size >= 100px) (.vertical) assert_equals: expected "true" but got ""
>+FAIL size(min-block-size: 100px) (.vertical) assert_equals: expected "true" but got ""
>+PASS size(min-block-size: 101px) (.vertical)
>+FAIL size(max-block-size: 100px) (.vertical) assert_equals: expected "true" but got ""
>+PASS size(max-block-size: 99px) (.vertical)
>+PASS size(inline-size < 200px) (.vertical)
>+FAIL size(inline-size >= 200px) (.vertical) assert_equals: expected "true" but got ""
>+FAIL size(min-inline-size: 200px) (.vertical) assert_equals: expected "true" but got ""
>+PASS size(min-inline-size: 201px) (.vertical)
>+FAIL size(max-inline-size: 200px) (.vertical) assert_equals: expected "true" but got ""
>+PASS size(max-inline-size: 199px) (.vertical)
>+PASS size(orientation: landscape) (.vertical)
>+FAIL size(orientation: portrait) (.vertical) assert_equals: expected "true" but got ""
>+FAIL size(aspect-ratio: 1/2) (.vertical) assert_equals: expected "true" but got ""
>+PASS size(aspect-ratio: 2/1) (.vertical)
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-expected.txt
>index 5507e93e2672df2c448f6d439112dd2d6015f331..c47e072240da67226ee5febf6b65fb604b032b87 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-expected.txt
>@@ -1,6 +1,6 @@
> 
> FAIL #container initially wider than 200px assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 255, 0)"
> FAIL #container changed to 200px assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 255, 0)"
>-FAIL Modal dialog still has parent as query container while in top layer assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 255, 0)"
>+PASS Modal dialog still has parent as query container while in top layer
> PASS Container changes width while dialog is in top layer
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/top-layer-nested-dialog-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/top-layer-nested-dialog-expected.txt
>index 987d05d8b1b7c038056f985b96172981f36b6de4..af85123c9e2a85a2f0e1b238e6d479f42a38d7fb 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/top-layer-nested-dialog-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/top-layer-nested-dialog-expected.txt
>@@ -1,5 +1,5 @@
> 
> FAIL Dialogs initially not matching for container queries assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 255, 0)"
>-FAIL Dialogs still not matching after showModal assert_equals: expected "rgb(255, 0, 0)" but got "rgb(0, 255, 0)"
>+PASS Dialogs still not matching after showModal
> PASS @container queries start matching
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/transition-scrollbars-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/transition-scrollbars-expected.txt
>index d3356d0a897cdbb104204154ab8b3c26f0730d14..24e32f8bd94f6dd8231933ece5fa9b41651ea9dc 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/transition-scrollbars-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/transition-scrollbars-expected.txt
>@@ -1,4 +1,4 @@
> Foo bar foo bar foo Foo bar foo bar foo Foo bar foo bar foo Foo bar foo bar foo Foo bar foo bar foo
> 
>-FAIL Scrollbars do not cause a transition of background-color assert_equals: expected "rgb(0, 0, 255)" but got "rgb(0, 128, 0)"
>+FAIL Scrollbars do not cause a transition of background-color assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 255)"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/unsupported-axis-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/unsupported-axis-expected.txt
>index 2f6d071dc08bef843bd0fcfc882f90565b7f5c9e..428d43f19a20205ce4dad937a0b0ecad0f4d7502 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/unsupported-axis-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/unsupported-axis-expected.txt
>@@ -1,14 +1,14 @@
> Test
> 
>-PASS size(width > 0px)
>-FAIL size(height > 0px) assert_equals: expected "" but got "true"
>-PASS size((height > 0px) or (width > 0px))
>-PASS size((width > 0px) or (height > 0px))
>-PASS size((orientation: landscape) or (width > 0px))
>-PASS size((width > 0px) or (orientation: landscape))
>-FAIL size((height > 0px) or (orientation: landscape)) assert_equals: expected "" but got "true"
>-FAIL size((height > 0px) or (orientation: landscape)), with contain:size assert_equals: expected "" but got "true"
>-PASS size(inline-size > 0px)
>-FAIL size(block-size > 0px) assert_equals: expected "" but got "true"
>-FAIL size(block-size > 0px), with writing-mode:vertical-rl assert_equals: expected "" but got "true"
>+FAIL size(width > 0px) assert_equals: expected "true" but got ""
>+PASS size(height > 0px)
>+FAIL size((height > 0px) or (width > 0px)) assert_equals: expected "true" but got ""
>+FAIL size((width > 0px) or (height > 0px)) assert_equals: expected "true" but got ""
>+FAIL size((orientation: landscape) or (width > 0px)) assert_equals: expected "true" but got ""
>+FAIL size((width > 0px) or (orientation: landscape)) assert_equals: expected "true" but got ""
>+PASS size((height > 0px) or (orientation: landscape))
>+PASS size((height > 0px) or (orientation: landscape)), with contain:size
>+FAIL size(inline-size > 0px) assert_equals: expected "true" but got ""
>+PASS size(block-size > 0px)
>+PASS size(block-size > 0px), with writing-mode:vertical-rl
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/viewport-units-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/viewport-units-expected.txt
>index a5cd452f99432e252e5b542365ea09690d8406f5..75d952285b75144065051b4ef34148ba6e574266 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/viewport-units-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/viewport-units-expected.txt
>@@ -1,6 +1,6 @@
> Green
> Green
> 
>-FAIL Match width with vw assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
>-FAIL Match width with vh assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
>+PASS Match width with vw
>+PASS Match width with vh
>

Actions: View | Formatted Diff | Diff

Attachments on bug 236096: 451087 | 451091 | 451098