Changeset 289443 in webkit

Timestamp:

Feb 8, 2022 3:49:27 PM (2 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (15.4): Angular virtual scrollers no longer work (because of contain:strict)
​https://bugs.webkit.org/show_bug.cgi?id=236260

Patch by Rob Buis <​rbuis@igalia.com> on 2022-02-08
Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-contain/contain-paint-049-expected.txt: Added.
• web-platform-tests/css/css-contain/contain-paint-049.html: Added.

Source/WebCore:

Paint containment did not allow collecting scrollable overflow, breaking scrolling
of the container contents, this patch fixes that.

Test: imported/w3c/web-platform-tests/css/css-contain/contain-paint-049.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::addOverflowFromChild):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/contain-paint-049-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-contain/contain-paint-049.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-08  Rob Buis  <rbuis@igalia.com>
+
+        REGRESSION (15.4): Angular virtual scrollers no longer work (because of contain:strict)
+        https://bugs.webkit.org/show_bug.cgi?id=236260
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-contain/contain-paint-049-expected.txt: Added.
+        * web-platform-tests/css/css-contain/contain-paint-049.html: Added.
+
 2022-02-08  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-08  Rob Buis  <rbuis@igalia.com>
+
+        REGRESSION (15.4): Angular virtual scrollers no longer work (because of contain:strict)
+        https://bugs.webkit.org/show_bug.cgi?id=236260
+
+        Reviewed by Simon Fraser.
+
+        Paint containment did not allow collecting scrollable overflow, breaking scrolling
+        of the container contents, this patch fixes that.
+
+        Test: imported/w3c/web-platform-tests/css/css-contain/contain-paint-049.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::addOverflowFromChild):
+
 2022-02-08  Brandon Stewart  <brandonstewart@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -4987 +4987 @@
 void RenderBox::addOverflowFromChild(const RenderBox* child, const LayoutSize& delta)
 {
-    if (paintContainmentApplies())
-        return;
     // Never allow flow threads to propagate overflow up to a parent.
     if (child->isRenderFragmentedFlow())
@@ -5003 +5001 @@
     childLayoutOverflowRect.move(delta);
     addLayoutOverflow(childLayoutOverflowRect);
+
+    if (paintContainmentApplies())
+        return;
 
     // Add in visual overflow from the child.  Even if the child clips its overflow, it may still