Changeset 291500 in webkit

Timestamp:

Mar 18, 2022 3:47:34 PM (4 months ago)

Author:

Antti Koivisto

Message:

[CSS Container Queries] Ensure container style changes are propagated to descendants
​https://bugs.webkit.org/show_bug.cgi?id=238072

Reviewed by Alan Bujtas.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt:
• web-platform-tests/css/css-contain/container-queries/container-type-invalidation-expected.txt:
• web-platform-tests/css/css-contain/container-queries/container-units-selection-expected.txt:

Source/WebCore:

• style/StyleChange.cpp:

(WebCore::Style::determineChange):

Ensure we recompute the descendants when container properties change.

• style/StyleTreeResolver.cpp:

(WebCore::Style::TreeResolver::resolveComposedTree):
(WebCore::Style::TreeResolver::updateQueryContainer):

We need to ensure layout is up-to-date also when a query container stops being one.
Remove the unused m_resolvedQueryContainers maps.

• style/StyleTreeResolver.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-type-invalidation-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-units-selection-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleChange.cpp (modified) (1 diff)
• Source/WebCore/style/StyleTreeResolver.cpp (modified) (3 diffs)
• Source/WebCore/style/StyleTreeResolver.h (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-03-18  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Ensure container style changes are propagated to descendants
+        https://bugs.webkit.org/show_bug.cgi?id=238072
+
+        Reviewed by Alan Bujtas.
+
+        * web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt:
+        * web-platform-tests/css/css-contain/container-queries/container-type-invalidation-expected.txt:
+        * web-platform-tests/css/css-contain/container-queries/container-units-selection-expected.txt:
+
 2022-03-18  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-name-invalidation-expected.txt

@@ -2 +2 @@
 
 PASS Changing a named container invalidates relevant descendants
-FAIL Changing container-name invalidates relevant descendants assert_equals: expected "rgb(0, 0, 0)" but got "rgb(0, 128, 0)"
+PASS Changing container-name invalidates relevant descendants
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-type-invalidation-expected.txt

@@ -1 +1 @@
 Test
 
-FAIL Changing the container type invalidates relevant descendants assert_equals: expected "rgb(0, 0, 0)" but got "rgb(0, 128, 0)"
+PASS Changing the container type invalidates relevant descendants
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/container-units-selection-expected.txt

@@ -1 +1 @@
 Test
 
-FAIL Container units select the proper container assert_equals: expected "30px" but got "10px"
+PASS Container units select the proper container
 FAIL Units respond to the writing-mode of the element assert_equals: expected "40px" but got "30px"
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-18  Antti Koivisto  <antti@apple.com>
+
+        [CSS Container Queries] Ensure container style changes are propagated to descendants
+        https://bugs.webkit.org/show_bug.cgi?id=238072
+
+        Reviewed by Alan Bujtas.
+
+        * style/StyleChange.cpp:
+        (WebCore::Style::determineChange):
+
+        Ensure we recompute the descendants when container properties change.
+
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::TreeResolver::resolveComposedTree):
+        (WebCore::Style::TreeResolver::updateQueryContainer):
+
+        We need to ensure layout is up-to-date also when a query container stops being one.
+        Remove the unused m_resolvedQueryContainers maps.
+
+        * style/StyleTreeResolver.h:
+
 2022-03-18  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebCore/style/StyleChange.cpp

@@ -64 +64 @@
         return Change::Inherited;
 
+    // Query container changes affect descendant style.
+    if (s1.containerType() != s2.containerType() || s1.containerNames() != s2.containerNames())
+        return Change::Inherited;
+
     if (s1 != s2)
         return Change::NonInherited;

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -707 +707 @@
         auto change = Change::None;
         auto descendantsToResolve = DescendantsToResolve::None;
+        auto previousContainerType = style ? style->containerType() : ContainerType::None;
 
         bool shouldResolve = shouldResolveElement(element, parent.descendantsToResolve);
@@ -738 +739 @@
 
         if (shouldIterateChildren) {
-            if (updateQueryContainer(element, *style) == QueryContainerAction::Layout)
+            if (updateQueryContainer(element, *style, previousContainerType) == QueryContainerAction::Layout)
                 shouldIterateChildren = false;
         }
@@ -763 +764 @@
 }
 
-auto TreeResolver::updateQueryContainer(Element& element, const RenderStyle& style) -> QueryContainerAction
-{
-    if (style.containerType() == ContainerType::None)
+auto TreeResolver::updateQueryContainer(Element& element, const RenderStyle& style, ContainerType previousContainerType) -> QueryContainerAction
+{
+    if (style.containerType() != ContainerType::None)
+        scope().selectorMatchingState.queryContainers.append(element);
+
+    if (m_unresolvedQueryContainers.remove(&element))
+        return QueryContainerAction::Continue;
+
+    // Render tree needs to be updated before proceeding to children also if we have a former query container
+    // because container query resolution for descendants relies on it being up-to-date.
+    if (style.containerType() == ContainerType::None && previousContainerType == ContainerType::None)
         return QueryContainerAction::None;
 
-    scope().selectorMatchingState.queryContainers.append(element);
-
-    if (m_unresolvedQueryContainers.remove(&element)) {
-        m_resolvedQueryContainers.add(&element);
+    if (m_update->isEmpty())
         return QueryContainerAction::Continue;
-    }
-
-    if (m_update->isEmpty()) {
-        m_resolvedQueryContainers.add(&element);
-        return QueryContainerAction::Continue;
-    }
-
+
+    // Bail out from TreeResolver to build a render tree and do a layout. Resolution continues after.
     m_unresolvedQueryContainers.add(&element);
-
     return QueryContainerAction::Layout;
 }

trunk/Source/WebCore/style/StyleTreeResolver.h

@@ -64 +64 @@
 
     enum class QueryContainerAction : uint8_t { None, Continue, Layout };
-    QueryContainerAction updateQueryContainer(Element&, const RenderStyle&);
+    QueryContainerAction updateQueryContainer(Element&, const RenderStyle&, ContainerType previousContainerType);
 
     enum class DescendantsToResolve : uint8_t { None, ChildrenWithExplicitInherit, Children, All };
@@ -128 +128 @@
 
     HashSet<RefPtr<Element>> m_unresolvedQueryContainers;
-    HashSet<RefPtr<Element>> m_resolvedQueryContainers;
 
     std::unique_ptr<Update> m_update;