Scrollbars are not clipped to layer bounds in RenderLayerBacking

https://bugs.webkit.org/show_bug.cgi?id=226823 Reviewed by Simon Fraser. Source/WebCore: Mask contents to bounds of overflow controls containers in RenderLayerBacking. Test: compositing/scrolling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars.html * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::updateGeometry): (WebCore::RenderLayerBacking::adjustOverflowControlsPositionRelativeToAncestor): LayoutTests: Adjust test expectations due to clipping on overflow controls container. * compositing/clipping/border-radius-async-overflow-clipping-layer-expected.txt: * compositing/layer-creation/clipping-scope/nested-scroller-overlap-expected.txt: * compositing/rtl/rtl-scrolling-with-transformed-descendants-expected.txt: * compositing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-clipped-by-scroll-expected.txt: * compositing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-expected.txt: * compositing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-nested-expected.txt: * compositing/scrolling/async-overflow-scrolling/layer-for-negative-z-in-scroller-expected.txt: * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-clip-to-hidden-expected.txt: * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-clip-to-visible-expected.txt: * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-expected.txt: * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-gain-clipping-layer-expected.txt: * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-in-clipped-expected.txt: * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-lose-clipping-layer-expected.txt: * compositing/scrolling/async-overflow-scrolling/nested-scrollers-backing-attachment-expected.txt: * compositing/scrolling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars-expected.html: Added. * compositing/scrolling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars.html: Added. * compositing/scrolling/async-overflow-scrolling/transform-change-scrollbar-position-expected.txt: * compositing/scrolling/async-overflow-scrolling/visibility-hidden-scrollers-expected.txt: * compositing/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt: * compositing/tiling/perspective-on-scroller-tile-coverage-expected.txt: * platform/mac-wk1/compositing/clipping/border-radius-async-overflow-clipping-layer-expected.txt: * tiled-drawing/scrolling/overflow/overflow-scrolled-down-tile-coverage-expected.txt: * tiled-drawing/scrolling/overflow/overflow-scrolled-up-tile-coverage-expected.txt: * tiled-drawing/scrolling/overflow/overflow-tile-coverage-expected.txt: Canonical link: https://commits.webkit.org/238825@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278883 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jun 15, 2021 · ed791fc · ed791fc
1 parent a705747
commit ed791fc
Show file tree

Hide file tree

Showing 27 changed files with 105 additions and 8 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,37 @@
+2021-06-15  Chris Lord  <clord@igalia.com>
+
+        Scrollbars are not clipped to layer bounds in RenderLayerBacking
+        https://bugs.webkit.org/show_bug.cgi?id=226823
+
+        Reviewed by Simon Fraser.
+
+        Adjust test expectations due to clipping on overflow controls container.
+
+        * compositing/clipping/border-radius-async-overflow-clipping-layer-expected.txt:
+        * compositing/layer-creation/clipping-scope/nested-scroller-overlap-expected.txt:
+        * compositing/rtl/rtl-scrolling-with-transformed-descendants-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-clipped-by-scroll-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-nested-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/layer-for-negative-z-in-scroller-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-clip-to-hidden-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-clip-to-visible-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-gain-clipping-layer-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-in-clipped-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/layer-in-overflow-lose-clipping-layer-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/nested-scrollers-backing-attachment-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars-expected.html: Added.
+        * compositing/scrolling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars.html: Added.
+        * compositing/scrolling/async-overflow-scrolling/transform-change-scrollbar-position-expected.txt:
+        * compositing/scrolling/async-overflow-scrolling/visibility-hidden-scrollers-expected.txt:
+        * compositing/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt:
+        * compositing/tiling/perspective-on-scroller-tile-coverage-expected.txt:
+        * platform/mac-wk1/compositing/clipping/border-radius-async-overflow-clipping-layer-expected.txt:
+        * tiled-drawing/scrolling/overflow/overflow-scrolled-down-tile-coverage-expected.txt:
+        * tiled-drawing/scrolling/overflow/overflow-scrolled-up-tile-coverage-expected.txt:
+        * tiled-drawing/scrolling/overflow/overflow-tile-coverage-expected.txt:
+
 2021-06-15  Alex Christensen  <achristensen@webkit.org>
 
         Check for "xn--" in any subdomain when parsing URL hosts

diff --git a/LayoutTests/compositing/clipping/border-radius-async-overflow-clipping-layer-expected.txt b/LayoutTests/compositing/clipping/border-radius-async-overflow-clipping-layer-expected.txt
@@ -39,6 +39,7 @@ This is the scrolled contents
             (GraphicsLayer
               (position 44.00 44.00)
               (bounds 320.00 200.00)
+              (clips 1)
               (children 1
                 (GraphicsLayer
                   (position 305.00 0.00)
@@ -86,6 +87,7 @@ This is the scrolled contents
             (GraphicsLayer
               (position 44.00 44.00)
               (bounds 320.00 200.00)
+              (clips 1)
               (children 1
                 (GraphicsLayer
                   (position 305.00 0.00)

diff --git a/LayoutTests/compositing/layer-creation/clipping-scope/nested-scroller-overlap-expected.txt b/LayoutTests/compositing/layer-creation/clipping-scope/nested-scroller-overlap-expected.txt
@@ -46,6 +46,7 @@
                         (GraphicsLayer
                           (position 1.00 1.00)
                           (bounds 300.00 200.00)
+                          (clips 1)
                           (children 1
                             (GraphicsLayer
                               (position 285.00 0.00)
@@ -138,6 +139,7 @@
         (GraphicsLayer
           (position 24.00 106.00)
           (bounds 400.00 350.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 385.00 0.00)

diff --git a/LayoutTests/compositing/rtl/rtl-scrolling-with-transformed-descendants-expected.txt b/LayoutTests/compositing/rtl/rtl-scrolling-with-transformed-descendants-expected.txt
@@ -86,6 +86,7 @@
         (GraphicsLayer
           (position 10.00 10.00)
           (bounds 400.00 219.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 0.00 204.00)

diff --git a/...rolling/async-overflow-scrolling/clipped-layer-in-overflow-clipped-by-scroll-expected.txt b/...rolling/async-overflow-scrolling/clipped-layer-in-overflow-clipped-by-scroll-expected.txt
@@ -55,6 +55,7 @@
         (GraphicsLayer
           (position 41.00 33.00)
           (bounds 316.00 316.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 301.00 0.00)

diff --git a/...sts/compositing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-expected.txt b/...sts/compositing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-expected.txt
@@ -55,6 +55,7 @@
         (GraphicsLayer
           (position 41.00 33.00)
           (bounds 316.00 316.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 301.00 0.00)

diff --git a/...positing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-nested-expected.txt b/...positing/scrolling/async-overflow-scrolling/clipped-layer-in-overflow-nested-expected.txt
@@ -56,6 +56,7 @@
                             (GraphicsLayer
                               (position 3.00 3.00)
                               (bounds 210.00 210.00)
+                              (clips 1)
                               (children 1
                                 (GraphicsLayer
                                   (position 195.00 0.00)
@@ -113,6 +114,7 @@
         (GraphicsLayer
           (position 41.00 33.00)
           (bounds 316.00 316.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 301.00 0.00)

diff --git a/...positing/scrolling/async-overflow-scrolling/layer-for-negative-z-in-scroller-expected.txt b/...positing/scrolling/async-overflow-scrolling/layer-for-negative-z-in-scroller-expected.txt
@@ -25,6 +25,7 @@
             (GraphicsLayer
               (position 9.00 9.00)
               (bounds 300.00 300.00)
+              (clips 1)
               (children 1
                 (GraphicsLayer
                   (position 285.00 0.00)

diff --git a/...positing/scrolling/async-overflow-scrolling/layer-in-overflow-clip-to-hidden-expected.txt b/...positing/scrolling/async-overflow-scrolling/layer-in-overflow-clip-to-hidden-expected.txt
@@ -55,6 +55,7 @@
         (GraphicsLayer
           (position 41.00 33.00)
           (bounds 316.00 316.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 301.00 0.00)

diff --git a/...ositing/scrolling/async-overflow-scrolling/layer-in-overflow-clip-to-visible-expected.txt b/...ositing/scrolling/async-overflow-scrolling/layer-in-overflow-clip-to-visible-expected.txt
@@ -48,6 +48,7 @@
         (GraphicsLayer
           (position 41.00 33.00)
           (bounds 316.00 316.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 301.00 0.00)

diff --git a/LayoutTests/compositing/scrolling/async-overflow-scrolling/layer-in-overflow-expected.txt b/LayoutTests/compositing/scrolling/async-overflow-scrolling/layer-in-overflow-expected.txt
@@ -48,6 +48,7 @@
         (GraphicsLayer
           (position 41.00 33.00)
           (bounds 316.00 316.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 301.00 0.00)

diff --git a/...ing/scrolling/async-overflow-scrolling/layer-in-overflow-gain-clipping-layer-expected.txt b/...ing/scrolling/async-overflow-scrolling/layer-in-overflow-gain-clipping-layer-expected.txt
@@ -55,6 +55,7 @@
         (GraphicsLayer
           (position 41.00 33.00)
           (bounds 316.00 316.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 301.00 0.00)

diff --git a/.../compositing/scrolling/async-overflow-scrolling/layer-in-overflow-in-clipped-expected.txt b/.../compositing/scrolling/async-overflow-scrolling/layer-in-overflow-in-clipped-expected.txt
@@ -67,6 +67,7 @@
             (GraphicsLayer
               (position 39.00 39.00)
               (bounds 316.00 316.00)
+              (clips 1)
               (children 1
                 (GraphicsLayer
                   (position 301.00 0.00)

diff --git a/...ing/scrolling/async-overflow-scrolling/layer-in-overflow-lose-clipping-layer-expected.txt b/...ing/scrolling/async-overflow-scrolling/layer-in-overflow-lose-clipping-layer-expected.txt
@@ -48,6 +48,7 @@
         (GraphicsLayer
           (position 41.00 33.00)
           (bounds 316.00 316.00)
+          (clips 1)
           (children 1
             (GraphicsLayer
               (position 301.00 0.00)

diff --git a/...iting/scrolling/async-overflow-scrolling/nested-scrollers-backing-attachment-expected.txt b/...iting/scrolling/async-overflow-scrolling/nested-scrollers-backing-attachment-expected.txt
@@ -91,6 +91,7 @@
           (children 1
             (GraphicsLayer
               (bounds 256.00 500.00)
+              (clips 1)
               (backingStoreAttached 1)
               (children 3
                 (GraphicsLayer
@@ -273,6 +274,7 @@
           (children 1
             (GraphicsLayer
               (bounds 444.00 500.00)
+              (clips 1)
               (backingStoreAttached 1)
               (children 3
                 (GraphicsLayer

diff --git a/...lling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars-expected.html b/...lling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars-expected.html
@@ -0,0 +1 @@
+<!DOCTYPE html>
diff --git a/...ting/scrolling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars.html b/...ting/scrolling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ AsyncOverflowScrollingEnabled=true ] -->
+
+<style>
+::-webkit-scrollbar {
+  background: red;
+}
+
+#item {
+  width: 0;
+  height: 100px;
+  overflow: auto;
+}
+
+#child {
+  height: 200px;
+}
+</style>
+
+<div id="item">
+  <div id="child">
+  </div>
+</div>
diff --git a/...iting/scrolling/async-overflow-scrolling/transform-change-scrollbar-position-expected.txt b/...iting/scrolling/async-overflow-scrolling/transform-change-scrollbar-position-expected.txt
@@ -31,6 +31,7 @@
             (GraphicsLayer
               (position 2.00 2.00)
               (bounds 520.00 420.00)
+              (clips 1)
               (children 1
                 (GraphicsLayer
                   (position 0.00 405.00)

diff --git a/...s/compositing/scrolling/async-overflow-scrolling/visibility-hidden-scrollers-expected.txt b/...s/compositing/scrolling/async-overflow-scrolling/visibility-hidden-scrollers-expected.txt
@@ -30,6 +30,7 @@ s
             (GraphicsLayer
               (position 2.00 2.00)
               (bounds 300.00 150.00)
+              (clips 1)
               (children 3
                 (GraphicsLayer
                   (position 0.00 135.00)

diff --git a/...iting/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt b/...iting/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt
@@ -66,6 +66,7 @@
             (GraphicsLayer
               (position 12.00 12.00)
               (bounds 296.00 296.00)
+              (clips 1)
               (children 1
                 (GraphicsLayer
                   (position 281.00 0.00)

diff --git a/LayoutTests/compositing/tiling/perspective-on-scroller-tile-coverage-expected.txt b/LayoutTests/compositing/tiling/perspective-on-scroller-tile-coverage-expected.txt
@@ -65,7 +65,7 @@
             (GraphicsLayer
               (bounds 600.00 500.00)
               (visible rect 0.00, 0.00 600.00 x 500.00)
-              (coverage rect -18.00, -10.00 800.00 x 600.00)
+              (coverage rect 0.00, 0.00 600.00 x 500.00)
               (intersects coverage rect 1)
               (contentsScale 1.00)
               (children 1
@@ -74,7 +74,7 @@
                   (bounds 15.00 500.00)
                   (drawsContent 1)
                   (visible rect 0.00, 0.00 15.00 x 500.00)
-                  (coverage rect -603.00, -10.00 800.00 x 600.00)
+                  (coverage rect -585.00, 0.00 600.00 x 500.00)
                   (intersects coverage rect 1)
                   (contentsScale 1.00)
                 )

diff --git a/...orm/mac-wk1/compositing/clipping/border-radius-async-overflow-clipping-layer-expected.txt b/...orm/mac-wk1/compositing/clipping/border-radius-async-overflow-clipping-layer-expected.txt
@@ -31,6 +31,7 @@ This is the scrolled contents
             (GraphicsLayer
               (position 44.00 44.00)
               (bounds 320.00 200.00)
+              (clips 1)
               (children 1
                 (GraphicsLayer
                   (position 305.00 0.00)
@@ -64,6 +65,7 @@ This is the scrolled contents
             (GraphicsLayer
               (position 44.00 44.00)
               (bounds 320.00 200.00)
+              (clips 1)
               (children 1
                 (GraphicsLayer
                   (position 305.00 0.00)

diff --git a/...tTests/tiled-drawing/scrolling/overflow/overflow-scrolled-down-tile-coverage-expected.txt b/...tTests/tiled-drawing/scrolling/overflow/overflow-scrolled-down-tile-coverage-expected.txt
@@ -58,7 +58,7 @@
               (position 1.00 1.00)
               (bounds 400.00 512.00)
               (visible rect 0.00, 0.00 400.00 x 512.00)
-              (coverage rect -59.00, -51.00 785.00 x 600.00)
+              (coverage rect 0.00, 0.00 400.00 x 512.00)
               (intersects coverage rect 1)
               (contentsScale 1.00)
               (children 1
@@ -67,7 +67,7 @@
                   (bounds 15.00 512.00)
                   (drawsContent 1)
                   (visible rect 0.00, 0.00 15.00 x 512.00)
-                  (coverage rect -444.00, -51.00 785.00 x 600.00)
+                  (coverage rect -385.00, 0.00 400.00 x 512.00)
                   (intersects coverage rect 1)
                   (contentsScale 1.00)
                 )

diff --git a/LayoutTests/tiled-drawing/scrolling/overflow/overflow-scrolled-up-tile-coverage-expected.txt b/LayoutTests/tiled-drawing/scrolling/overflow/overflow-scrolled-up-tile-coverage-expected.txt
@@ -58,7 +58,7 @@
               (position 1.00 1.00)
               (bounds 400.00 512.00)
               (visible rect 0.00, 0.00 400.00 x 512.00)
-              (coverage rect -59.00, -51.00 785.00 x 600.00)
+              (coverage rect 0.00, 0.00 400.00 x 512.00)
               (intersects coverage rect 1)
               (contentsScale 1.00)
               (children 1
@@ -67,7 +67,7 @@
                   (bounds 15.00 512.00)
                   (drawsContent 1)
                   (visible rect 0.00, 0.00 15.00 x 512.00)
-                  (coverage rect -444.00, -51.00 785.00 x 600.00)
+                  (coverage rect -385.00, 0.00 400.00 x 512.00)
                   (intersects coverage rect 1)
                   (contentsScale 1.00)
                 )

diff --git a/LayoutTests/tiled-drawing/scrolling/overflow/overflow-tile-coverage-expected.txt b/LayoutTests/tiled-drawing/scrolling/overflow/overflow-tile-coverage-expected.txt
@@ -56,7 +56,7 @@
               (position 1.00 1.00)
               (bounds 400.00 512.00)
               (visible rect 0.00, 0.00 400.00 x 512.00)
-              (coverage rect -59.00, -51.00 785.00 x 600.00)
+              (coverage rect 0.00, 0.00 400.00 x 512.00)
               (intersects coverage rect 1)
               (contentsScale 1.00)
               (children 1
@@ -65,7 +65,7 @@
                   (bounds 15.00 512.00)
                   (drawsContent 1)
                   (visible rect 0.00, 0.00 15.00 x 512.00)
-                  (coverage rect -444.00, -51.00 785.00 x 600.00)
+                  (coverage rect -385.00, 0.00 400.00 x 512.00)
                   (intersects coverage rect 1)
                   (contentsScale 1.00)
                 )

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2021-06-15  Chris Lord  <clord@igalia.com>
+
+        Scrollbars are not clipped to layer bounds in RenderLayerBacking
+        https://bugs.webkit.org/show_bug.cgi?id=226823
+
+        Reviewed by Simon Fraser.
+
+        Mask contents to bounds of overflow controls containers in RenderLayerBacking.
+
+        Test: compositing/scrolling/async-overflow-scrolling/overflow-controls-container-clips-scrollbars.html
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateGeometry):
+        (WebCore::RenderLayerBacking::adjustOverflowControlsPositionRelativeToAncestor):
+
 2021-06-15  Eric Carlson  <eric.carlson@apple.com>
 
         [Mac] CoreMedia WrapperClass does not need alignment fixup

diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -1428,6 +1428,7 @@ void RenderLayerBacking::updateGeometry(const RenderLayer* compositedAncestor)
 
         m_overflowControlsContainer->setPosition(snappedBoxInfo.m_snappedRect.location());
         m_overflowControlsContainer->setSize(snappedBoxInfo.m_snappedRect.size());
+        m_overflowControlsContainer->setMasksToBounds(true);
     }
 
     if (m_foregroundLayer) {
@@ -1507,6 +1508,7 @@ void RenderLayerBacking::adjustOverflowControlsPositionRelativeToAncestor(const
     SnappedRectInfo snappedBoxInfo = snappedGraphicsLayer(boxOffsetFromGraphicsLayer, overflowControlsRect.size(), deviceScaleFactor());
 
     m_overflowControlsContainer->setPosition(snappedBoxInfo.m_snappedRect.location());
+    m_overflowControlsContainer->setSize(snappedBoxInfo.m_snappedRect.size());
 }
 
 void RenderLayerBacking::setLocationOfScrolledContents(ScrollOffset scrollOffset, ScrollingLayerPositionAction setOrSync)