Context Navigation

Changeset 290320 in webkit

Timestamp:

Feb 22, 2022 11:02:52 AM (5 months ago)

Author:

Antti Koivisto

Message:

[CSS container Queries] getComputedStyle should update style for invalid query containers
https://bugs.webkit.org/show_bug.cgi?id=237038

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

web-platform-tests/css/css-contain/container-queries/animation-container-size-expected.txt:
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/backdrop-invalidation-expected.txt:
web-platform-tests/css/css-contain/container-queries/pseudo-elements-001-expected.txt:

Source/WebCore:

(WebCore::hasValidStyleForProperty):

We always need to update style inside a query container since a change to it may affect descendants.

Location:

trunk

Files:

-                      r290306
+                      r290320
+-02-22  Antti Koivisto  <antti@apple.com>
+        [CSS container Queries] getComputedStyle should update style for invalid query containers
+        https://bugs.webkit.org/show_bug.cgi?id=237038
+        Reviewed by Darin Adler.
+        * web-platform-tests/css/css-contain/container-queries/animation-container-size-expected.txt:
+        * 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/backdrop-invalidation-expected.txt:
+        * web-platform-tests/css/css-contain/container-queries/pseudo-elements-001-expected.txt:
 -02-22  Tim Nguyen  <ntim@apple.com>

r288786	r290320
1	1	Test
2	2
3		FAIL Animation affects container query evaluation assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 255)"
	3	PASS Animation affects container query evaluation
4	4

r289222	r290320
1	1	Test
2	2
3		FAIL Animated container creating new container assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 255)"
	3	PASS Animated container creating new container
4	4

r289222	r290320
1	1	Test
2	2
3		FAIL Animated container can create inner animation assert_equals: expected "rgb(0, 0, 255)" but got "rgb(0, 128, 0)"
	3	PASS Animated container can create inner animation
4	4

r289222	r290320
1	1	Test
2	2
3		FAIL Animated container size triggers transition assert_equals: expected "rgb(150, 150, 150)" but got "rgb(100, 100, 100)"
	3	PASS Animated container size triggers transition
4	4

r289890	r290320
1	1
2	2	PASS @container queries with aspect-ratio and size containment
3		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)"
	3	PASS @container query with aspect-ratio change after resize
4	4

r290205	r290320
1	1
2		FAIL Pseudo-element ::backdrop responds to container size changes assert_equals: expected "rgb(0, 128, 0)" but got "rgb(0, 0, 0)"
	2	PASS Pseudo-element ::backdrop responds to container size changes
3	3

r290205	r290320
2	2	One
3	3
4		FAIL Pseudo-elements ::before and ::after respond to container size changes assert_equals: expected "\"before\"" but got "none"
	4	PASS Pseudo-elements ::before and ::after respond to container size changes
5	5	PASS Pseudo-element ::marker responds to container size changes
6	6

-                      r290319
+                      r290320
+-02-22  Antti Koivisto  <antti@apple.com>
+        [CSS container Queries] getComputedStyle should update style for invalid query containers
+        https://bugs.webkit.org/show_bug.cgi?id=237038
+        Reviewed by Darin Adler.
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::hasValidStyleForProperty):
+        We always need to update style inside a query container since a change to it may affect descendants.
 -02-22  Kate Cheney  <katherine_cheney@apple.com>

-                      r290026
+                      r290320
         return true;
+    auto isQueryContainer = [&](Element& element) {
+        auto* style = element.renderStyle();
+        return style && style->containerType() != ContainerType::None;
+    };
     bool isInherited = CSSProperty::isInheritedProperty(propertyID) || isImplicitlyInheritedGridOrFlexProperty(propertyID);
     bool maybeExplicitlyInherited = !isInherited;
+    if (isQueryContainer(element))
+        return false;
     const auto* currentElement = &element;
     for (auto& ancestor : composedTreeAncestors(element)) {
         if (ancestor.styleValidity() >= Style::Validity::SubtreeInvalid)
+            return false;
+        if (isQueryContainer(ancestor))
             return false;

Note: See TracChangeset for help on using the changeset viewer.