Changeset 266923 in webkit

Timestamp:

Sep 11, 2020, 8:39:02 AM (6 years ago)

Author:

Simon Fraser

Message:

REGRESSION (Async overflow scroll): Mouse wheel scrolling over an "always-on" overflow scrollbar doesn't work
​https://bugs.webkit.org/show_bug.cgi?id=216381
<rdar://problem/68593743>

Reviewed by Antti Koivisto.

Source/WebCore:

The scrollbar and scroll corner layers need event regions and scrollingNodeIDs so that
we hit-test them via CA layers and find the right scrolling node.

Test: fast/scrolling/mac/mousewheel-over-scrollbar.html

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateAfterDescendants):
(WebCore::RenderLayerBacking::updateEventRegion):
(WebCore::RenderLayerBacking::detachFromScrollingCoordinator):
(WebCore::RenderLayerBacking::setScrollingNodeIDForRole):

LayoutTests:

• fast/scrolling/mac/border-radius-event-region-expected.txt:
• fast/scrolling/mac/event-region-scrolled-contents-layer-expected.txt:
• fast/scrolling/mac/event-region-subscroller-overflow-expected.txt:
• fast/scrolling/mac/event-region-visibility-hidden-expected.txt:
• fast/scrolling/mac/mousewheel-over-scrollbar-expected.txt: Added.
• fast/scrolling/mac/mousewheel-over-scrollbar.html: Added.
• fast/scrolling/mac/negative-z-index-overflow-scroll-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/scrolling/mac/border-radius-event-region-expected.txt (modified) (3 diffs)
• LayoutTests/fast/scrolling/mac/event-region-scrolled-contents-layer-expected.txt (modified) (3 diffs)
• LayoutTests/fast/scrolling/mac/event-region-subscroller-overflow-expected.txt (modified) (3 diffs)
• LayoutTests/fast/scrolling/mac/event-region-visibility-hidden-expected.txt (modified) (3 diffs)
• LayoutTests/fast/scrolling/mac/mousewheel-over-scrollbar-expected.txt (added)
• LayoutTests/fast/scrolling/mac/mousewheel-over-scrollbar.html (added)
• LayoutTests/fast/scrolling/mac/negative-z-index-overflow-scroll-expected.txt (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-11  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (Async overflow scroll): Mouse wheel scrolling over an "always-on" overflow scrollbar doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=216381
+        <rdar://problem/68593743>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/scrolling/mac/border-radius-event-region-expected.txt:
+        * fast/scrolling/mac/event-region-scrolled-contents-layer-expected.txt:
+        * fast/scrolling/mac/event-region-subscroller-overflow-expected.txt:
+        * fast/scrolling/mac/event-region-visibility-hidden-expected.txt:
+        * fast/scrolling/mac/mousewheel-over-scrollbar-expected.txt: Added.
+        * fast/scrolling/mac/mousewheel-over-scrollbar.html: Added.
+        * fast/scrolling/mac/negative-z-index-overflow-scroll-expected.txt:
+
 2020-09-10  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/LayoutTests/fast/scrolling/mac/border-radius-event-region-expected.txt

@@ -36 +36 @@
                   (bounds 35.00 15.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=35 height=15)
+                  )
                 )
                 (GraphicsLayer
@@ -41 +44 @@
                   (bounds 15.00 35.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=15 height=35)
+                  )
                 )
                 (GraphicsLayer
@@ -46 +52 @@
                   (bounds 15.00 15.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=15 height=15)
+                  )
                 )
               )

trunk/LayoutTests/fast/scrolling/mac/event-region-scrolled-contents-layer-expected.txt

@@ -37 +37 @@
                   (bounds 285.00 15.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=285 height=15)
+                  )
                 )
                 (GraphicsLayer
@@ -42 +45 @@
                   (bounds 15.00 285.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=15 height=285)
+                  )
                 )
                 (GraphicsLayer
@@ -47 +53 @@
                   (bounds 15.00 15.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=15 height=15)
+                  )
                 )
               )

trunk/LayoutTests/fast/scrolling/mac/event-region-subscroller-overflow-expected.txt

@@ -58 +58 @@
                   (bounds 35.00 15.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=35 height=15)
+                  )
                 )
                 (GraphicsLayer
@@ -63 +66 @@
                   (bounds 15.00 35.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=15 height=35)
+                  )
                 )
                 (GraphicsLayer
@@ -68 +74 @@
                   (bounds 15.00 15.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=15 height=15)
+                  )
                 )
               )

trunk/LayoutTests/fast/scrolling/mac/event-region-visibility-hidden-expected.txt

@@ -38 +38 @@
                   (bounds 35.00 15.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=35 height=15)
+                  )
                 )
                 (GraphicsLayer
@@ -43 +46 @@
                   (bounds 15.00 35.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=15 height=35)
+                  )
                 )
                 (GraphicsLayer
@@ -48 +54 @@
                   (bounds 15.00 15.00)
                   (drawsContent 1)
+                  (event region
+                    (rect (0,0) width=15 height=15)
+                  )
                 )
               )

trunk/LayoutTests/fast/scrolling/mac/negative-z-index-overflow-scroll-expected.txt

@@ -56 +56 @@
                           (bounds 425.00 15.00)
                           (drawsContent 1)
+                          (event region
+                            (rect (0,0) width=425 height=15)
+                          )
                         )
                         (GraphicsLayer
@@ -61 +64 @@
                           (bounds 15.00 625.00)
                           (drawsContent 1)
+                          (event region
+                            (rect (0,0) width=15 height=625)
+                          )
                         )
                         (GraphicsLayer
@@ -66 +72 @@
                           (bounds 15.00 15.00)
                           (drawsContent 1)
+                          (event region
+                            (rect (0,0) width=15 height=15)
+                          )
                         )
                       )

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-11  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (Async overflow scroll): Mouse wheel scrolling over an "always-on" overflow scrollbar doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=216381
+        <rdar://problem/68593743>
+
+        Reviewed by Antti Koivisto.
+
+        The scrollbar and scroll corner layers need event regions and scrollingNodeIDs so that
+        we hit-test them via CA layers and find the right scrolling node.
+
+        Test: fast/scrolling/mac/mousewheel-over-scrollbar.html
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateAfterDescendants):
+        (WebCore::RenderLayerBacking::updateEventRegion):
+        (WebCore::RenderLayerBacking::detachFromScrollingCoordinator):
+        (WebCore::RenderLayerBacking::setScrollingNodeIDForRole):
+
 2020-09-11  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1528 +1528 @@
     if (m_scrollContainerLayer) {
         m_scrollContainerLayer->setContentsVisible(renderer().style().visibility() == Visibility::Visible);
-        m_scrollContainerLayer->setUserInteractionEnabled(renderer().style().pointerEvents() != PointerEvents::None);
+
+        bool userInteractive = renderer().style().pointerEvents() != PointerEvents::None;
+        m_scrollContainerLayer->setUserInteractionEnabled(userInteractive);
+        if (m_layerForHorizontalScrollbar)
+            m_layerForHorizontalScrollbar->setUserInteractionEnabled(userInteractive);
+        if (m_layerForVerticalScrollbar)
+            m_layerForVerticalScrollbar->setUserInteractionEnabled(userInteractive);
+        if (m_layerForScrollCorner)
+            m_layerForScrollCorner->setUserInteractionEnabled(userInteractive);
     }
 
@@ -1736 +1744 @@
     TraceScope scope(ComputeEventRegionsStart, ComputeEventRegionsEnd);
 
+    auto visibleToHitTesting = renderer().visibleToHitTesting();
+
+    auto setEventRegionToLayerBounds = [&](GraphicsLayer* graphicsLayer) {
+        if (!graphicsLayer)
+            return;
+
+        EventRegion eventRegion;
+        auto eventRegionContext = eventRegion.makeContext();
+        if (visibleToHitTesting)
+            eventRegionContext.unite(enclosingIntRect(FloatRect({ }, graphicsLayer->size())), renderer().style());
+
+        graphicsLayer->setEventRegion(WTFMove(eventRegion));
+    };
+
     auto updateEventRegionForLayer = [&](GraphicsLayer& graphicsLayer) {
         GraphicsContext nullContext(nullptr);
@@ -1746 +1768 @@
         auto layerOffset = graphicsLayer.scrollOffset() - roundedIntSize(graphicsLayer.offsetFromRenderer());
 
-        if (renderer().visibleToHitTesting()) {
-            if (&graphicsLayer == m_scrollContainerLayer) {
-                eventRegionContext.unite(enclosingIntRect(FloatRect({ }, graphicsLayer.size())), renderer().style());
-                graphicsLayer.setEventRegion(WTFMove(eventRegion));
-                return;
-            }
-
+        if (visibleToHitTesting) {
             if (&graphicsLayer == m_scrolledContentsLayer) {
                 // Initialize scrolled contents layer with layer-sized event region as it can all used for scrolling.
@@ -1770 +1786 @@
     updateEventRegionForLayer(*m_graphicsLayer);
 
-    if (m_scrollContainerLayer)
-        updateEventRegionForLayer(*m_scrollContainerLayer);
+    setEventRegionToLayerBounds(m_scrollContainerLayer.get());
+    setEventRegionToLayerBounds(m_layerForHorizontalScrollbar.get());
+    setEventRegionToLayerBounds(m_layerForVerticalScrollbar.get());
+    setEventRegionToLayerBounds(m_layerForScrollCorner.get());
 
     if (m_scrolledContentsLayer)
@@ -2270 +2288 @@
         if (m_scrollContainerLayer)
             m_scrollContainerLayer->setScrollingNodeID(0);
+        if (m_layerForHorizontalScrollbar)
+            m_layerForHorizontalScrollbar->setScrollingNodeID(0);
+        if (m_layerForVerticalScrollbar)
+            m_layerForVerticalScrollbar->setScrollingNodeID(0);
+        if (m_layerForScrollCorner)
+            m_layerForScrollCorner->setScrollingNodeID(0);
 #endif
     }
@@ -2308 +2332 @@
         if (m_scrollContainerLayer)
             m_scrollContainerLayer->setScrollingNodeID(m_scrollingNodeID);
+
+        if (m_layerForHorizontalScrollbar)
+            m_layerForHorizontalScrollbar->setScrollingNodeID(m_scrollingNodeID);
+        if (m_layerForVerticalScrollbar)
+            m_layerForVerticalScrollbar->setScrollingNodeID(m_scrollingNodeID);
+        if (m_layerForScrollCorner)
+            m_layerForScrollCorner->setScrollingNodeID(m_scrollingNodeID);
 #endif
         break;