Changeset 261602 in webkit

Timestamp:

May 13, 2020 12:10:51 AM (4 years ago)

Author:

Antti Koivisto

Message:

[Wheel event region] Add support for getting wheel event region from ScrollingTree
​https://bugs.webkit.org/show_bug.cgi?id=211785

Reviewed by Simon Fraser.

Add ScrollingTree::eventListenerRegionTypesForPoint. It is not used yet.

• page/scrolling/ScrollingTree.cpp:

(WebCore::ScrollingTree::eventListenerRegionTypesForPoint const):

• page/scrolling/ScrollingTree.h:
• page/scrolling/mac/ScrollingTreeMac.h:
• page/scrolling/mac/ScrollingTreeMac.mm:

(collectDescendantLayersAtPoint):
(ScrollingTreeMac::eventListenerRegionTypesForPoint const):

• platform/graphics/ca/PlatformCALayer.h:
• platform/graphics/ca/cocoa/PlatformCALayerCocoa.h:
• platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:

(WebCore::PlatformCALayerCocoa::eventRegionContainsPoint const): Deleted.

• rendering/EventRegion.cpp:

(WebCore::EventRegion::eventListenerRegionTypesForPoint const):

• rendering/EventRegion.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingTree.cpp (modified) (1 diff)
• page/scrolling/ScrollingTree.h (modified) (2 diffs)
• page/scrolling/mac/ScrollingTreeMac.h (modified) (2 diffs)
• page/scrolling/mac/ScrollingTreeMac.mm (modified) (2 diffs)
• platform/graphics/ca/PlatformCALayer.h (modified) (1 diff)
• platform/graphics/ca/cocoa/PlatformCALayerCocoa.h (modified) (1 diff)
• platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (modified) (1 diff)
• rendering/EventRegion.cpp (modified) (1 diff)
• rendering/EventRegion.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-13  Antti Koivisto  <antti@apple.com>
+
+        [Wheel event region] Add support for getting wheel event region from ScrollingTree
+        https://bugs.webkit.org/show_bug.cgi?id=211785
+
+        Reviewed by Simon Fraser.
+
+        Add ScrollingTree::eventListenerRegionTypesForPoint. It is not used yet.
+
+        * page/scrolling/ScrollingTree.cpp:
+        (WebCore::ScrollingTree::eventListenerRegionTypesForPoint const):
+        * page/scrolling/ScrollingTree.h:
+        * page/scrolling/mac/ScrollingTreeMac.h:
+        * page/scrolling/mac/ScrollingTreeMac.mm:
+        (collectDescendantLayersAtPoint):
+        (ScrollingTreeMac::eventListenerRegionTypesForPoint const):
+        * platform/graphics/ca/PlatformCALayer.h:
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.h:
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+        (WebCore::PlatformCALayerCocoa::eventRegionContainsPoint const): Deleted.
+        * rendering/EventRegion.cpp:
+        (WebCore::EventRegion::eventListenerRegionTypesForPoint const):
+        * rendering/EventRegion.h:
+
 2020-05-12  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp

@@ -171 +171 @@
 }
 
+OptionSet<EventListenerRegionType> ScrollingTree::eventListenerRegionTypesForPoint(FloatPoint) const
+{
+    return { };
+}
+
 void ScrollingTree::traverseScrollingTree(VisitorFunction&& visitorFunction)
 {

trunk/Source/WebCore/page/scrolling/ScrollingTree.h

@@ -54 +54 @@
 class ScrollingTreePositionedNode;
 class ScrollingTreeScrollingNode;
+enum class EventListenerRegionType : uint8_t;
 
 class ScrollingTree : public ThreadSafeRefCounted<ScrollingTree> {
@@ -195 +196 @@
 
     WEBCORE_EXPORT virtual RefPtr<ScrollingTreeNode> scrollingNodeForPoint(FloatPoint);
+    WEBCORE_EXPORT virtual OptionSet<EventListenerRegionType> eventListenerRegionTypesForPoint(FloatPoint) const;
     virtual void receivedWheelEvent(const PlatformWheelEvent&) { }
 

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.h

@@ -44 +44 @@
 
     RefPtr<ScrollingTreeNode> scrollingNodeForPoint(FloatPoint) final;
+    OptionSet<EventListenerRegionType> eventListenerRegionTypesForPoint(FloatPoint) const final;
 
     void setWheelEventTestMonitor(RefPtr<WheelEventTestMonitor>&&) final;
@@ -56 +57 @@
 
     // This lock protects the CALayer/PlatformCALayer tree.
-    Lock m_layerHitTestMutex;
+    mutable Lock m_layerHitTestMutex;
     
     RefPtr<WheelEventTestMonitor> m_wheelEventTestMonitor;

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.mm

@@ -103 +103 @@
                 FloatPoint boundsOrigin = layer.bounds.origin;
                 FloatPoint localPoint = subviewPoint - toFloatSize(boundsOrigin);
-                return platformCALayer->eventRegionContainsPoint(IntPoint(localPoint));
+                auto* eventRegion = platformCALayer->eventRegion();
+                return eventRegion && eventRegion->contains(roundedIntPoint(localPoint));
             }
             
@@ -185 +186 @@
 }
 
+OptionSet<EventListenerRegionType> ScrollingTreeMac::eventListenerRegionTypesForPoint(FloatPoint point) const
+{
+    auto* rootScrollingNode = rootNode();
+    if (!rootScrollingNode)
+        return { };
+
+    LockHolder lockHolder(m_layerHitTestMutex);
+
+    auto rootContentsLayer = static_cast<ScrollingTreeFrameScrollingNodeMac*>(rootScrollingNode)->rootContentsLayer();
+
+    Vector<CALayer *, 16> layersAtPoint;
+    collectDescendantLayersAtPoint(layersAtPoint, rootContentsLayer.get(), point);
+
+    if (layersAtPoint.isEmpty())
+        return { };
+
+    auto *hitLayer = layersAtPoint.last();
+    if (!hitLayer)
+        return { };
+
+    auto platformCALayer = PlatformCALayer::platformCALayerForLayer((__bridge void*)hitLayer);
+    if (!platformCALayer)
+        return { };
+
+    auto* eventRegion = platformCALayer->eventRegion();
+    if (!eventRegion)
+        return { };
+
+    return eventRegion->eventListenerRegionTypesForPoint(roundedIntPoint(point));
+}
+
 void ScrollingTreeMac::lockLayersForHitTesting()
 {

trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h

@@ -236 +236 @@
     virtual void setShapeWindRule(WindRule) = 0;
 
+    virtual const EventRegion* eventRegion() const { return nullptr; }
     virtual void setEventRegion(const EventRegion&) { }
-    virtual bool eventRegionContainsPoint(IntPoint) const { return false; }
     
 #if ENABLE(SCROLLING_THREAD)

trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h

@@ -169 +169 @@
     void updateCustomAppearance(GraphicsLayer::CustomAppearance) override;
 
+    const EventRegion* eventRegion() const override { return &m_eventRegion; }
     void setEventRegion(const EventRegion&) override;
-    bool eventRegionContainsPoint(IntPoint) const override;
 
 #if ENABLE(SCROLLING_THREAD)

trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

@@ -1039 +1039 @@
 }
 
-bool PlatformCALayerCocoa::eventRegionContainsPoint(IntPoint point) const
-{
-    return m_eventRegion.contains(point);
-}
-
 GraphicsLayer::EmbeddedViewID PlatformCALayerCocoa::embeddedViewID() const
 {

trunk/Source/WebCore/rendering/EventRegion.cpp

@@ -230 +230 @@
 }
 
+OptionSet<EventListenerRegionType> EventRegion::eventListenerRegionTypesForPoint(const IntPoint& point) const
+{
+    OptionSet<EventListenerRegionType> regionTypes;
+    if (m_wheelEventListenerRegion.contains(point))
+        regionTypes.add(EventListenerRegionType::Wheel);
+    if (m_nonPassiveWheelEventListenerRegion.contains(point))
+        regionTypes.add(EventListenerRegionType::NonPassiveWheel);
+
+    return regionTypes;
+}
+
 #if ENABLE(EDITABLE_REGION)
 

trunk/Source/WebCore/rendering/EventRegion.h

@@ -80 +80 @@
     const Region* regionForTouchAction(TouchAction) const;
 
+    OptionSet<EventListenerRegionType> eventListenerRegionTypesForPoint(const IntPoint&) const;
+
 #if ENABLE(EDITABLE_REGION)
     WEBCORE_EXPORT bool containsEditableElementsInRect(const IntRect&) const;