Changeset 295200 in webkit for trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

Timestamp:

Jun 3, 2022, 2:54:36 AM (3 years ago)

Author:

Antti Koivisto

Message:

Re-evaluate queries after subframe size changes
​https://bugs.webkit.org/show_bug.cgi?id=241225

Reviewed by Alan Bujtas.

Container queries in frames don't react to frame size changes.

• LayoutTests/TestExpectations:

Mark imported/w3c/web-platform-tests/css/css-contain/container-queries/inline-size-bfc-floats.html as failure, it has ever
been passing by fluke (there are some containment issues with floats).

• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/iframe-in-container-invalidation-expected.txt:
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/container-queries/iframe-invalidation-expected.txt:
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

Ensure we update layout when there are container queries in a subframe, similar to media queries.

• Source/WebCore/dom/Document.cpp:

(WebCore::Document::resolveStyle):
(WebCore::Document::updateLayout):

• Source/WebCore/page/FrameView.cpp:

(WebCore::FrameView::updateContentsSize):
(WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive):

• Source/WebCore/page/FrameViewLayoutContext.cpp:

(WebCore::FrameViewLayoutContext::layout):

Move the container query invalidation loop to the main layout function so all paths are covered.

(WebCore::FrameViewLayoutContext::performLayout):

• Source/WebCore/page/FrameViewLayoutContext.h:
• Source/WebCore/style/StyleScopeRuleSets.cpp:

(WebCore::Style::ScopeRuleSets::hasContainerQueries const):

• Source/WebCore/style/StyleScopeRuleSets.h:

Canonical link: ​https://commits.webkit.org/251257@main

File:

• trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -2896 +2896 @@
         style = computeRenderStyleForProperty(*styledElement, m_pseudoElementSpecifier, propertyID, ownedStyle, styledRenderer());
 
-        // FIXME: Some of these cases could be narrowed down or optimized better.
-        forceFullLayout = isLayoutDependent(propertyID, style, styledRenderer())
-            || styledElement->isInShadowTree()
-            || (document.styleScope().resolverIfExists() && document.styleScope().resolverIfExists()->hasViewportDependentMediaQueries() && document.ownerElement());
+        forceFullLayout = [&] {
+            // FIXME: Some of these cases could be narrowed down or optimized better.
+            if (isLayoutDependent(propertyID, style, styledRenderer()))
+                return true;
+            // FIXME: Why?
+            if (styledElement->isInShadowTree())
+                return true;
+            if (!document.ownerElement())
+                return false;
+            if (!document.styleScope().resolverIfExists())
+                return false;
+            auto& ruleSets = document.styleScope().resolverIfExists()->ruleSets();
+            return ruleSets.hasViewportDependentMediaQueries() || ruleSets.hasContainerQueries();
+        }();
 
         if (forceFullLayout)