Changeset 244037 in webkit

Timestamp:

Apr 8, 2019 1:32:53 PM (5 years ago)

Author:

Antti Koivisto

Message:

Update touch-action region on property changes
​https://bugs.webkit.org/show_bug.cgi?id=196608

Reviewed by Simon Fraser.

Source/WebCore:

Test: pointerevents/ios/touch-action-region-dynamic.html

• rendering/EventRegion.cpp:

(WebCore::EventRegion::touchActionsForPoint const):

Correctly return 'auto' when nothing is found from the regions (this code is not used yet).

• rendering/RenderElement.cpp:

(WebCore::RenderElement::styleWillChange):

React to 'touch-action' property changes, similarly to 'pointer-events'.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::invalidateEventRegion):

Test if need to invalidate.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::setContentsNeedDisplay):
(WebCore::RenderLayerBacking::setContentsNeedDisplayInRect):

Call invalidateEventRegion explicitly instead of relying on compositing update. This ensures
that we update the top level event region correctly when we have touch-actions.

LayoutTests:

• pointerevents/ios/touch-action-region-dynamic-expected.txt: Added.
• pointerevents/ios/touch-action-region-dynamic.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/pointerevents/ios/touch-action-region-dynamic-expected.txt (added)
• LayoutTests/pointerevents/ios/touch-action-region-dynamic.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/EventRegion.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderElement.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-08  Antti Koivisto  <antti@apple.com>
+
+        Update touch-action region on property changes
+        https://bugs.webkit.org/show_bug.cgi?id=196608
+
+        Reviewed by Simon Fraser.
+
+        * pointerevents/ios/touch-action-region-dynamic-expected.txt: Added.
+        * pointerevents/ios/touch-action-region-dynamic.html: Added.
+
 2019-04-08  Javier Fernandez  <jfernandez@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-08  Antti Koivisto  <antti@apple.com>
+
+        Update touch-action region on property changes
+        https://bugs.webkit.org/show_bug.cgi?id=196608
+
+        Reviewed by Simon Fraser.
+
+        Test: pointerevents/ios/touch-action-region-dynamic.html
+
+        * rendering/EventRegion.cpp:
+        (WebCore::EventRegion::touchActionsForPoint const):
+
+        Correctly return 'auto' when nothing is found from the regions (this code is not used yet).
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::styleWillChange):
+
+        React to 'touch-action' property changes, similarly to 'pointer-events'.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::invalidateEventRegion):
+
+        Test if need to invalidate.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::setContentsNeedDisplay):
+        (WebCore::RenderLayerBacking::setContentsNeedDisplayInRect):
+
+        Call invalidateEventRegion explicitly instead of relying on compositing update. This ensures
+        that we update the top level event region correctly when we have touch-actions.
+
 2019-04-08  Javier Fernandez  <jfernandez@igalia.com>
 

trunk/Source/WebCore/rendering/EventRegion.cpp

@@ -137 +137 @@
     }
 
+    if (actions.isEmpty())
+        return { TouchAction::Auto };
+
     return actions;
 }

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -731 +731 @@
         }
 
-        if (m_style.pointerEvents() != newStyle.pointerEvents()) {
+        auto needsInvalidateEventRegion = [&] {
+            if (m_style.pointerEvents() != newStyle.pointerEvents())
+                return true;
+#if ENABLE(POINTER_EVENTS)
+            if (m_style.effectiveTouchActions() != newStyle.effectiveTouchActions())
+                return true;
+#endif
+            return false;
+        };
+
+        if (needsInvalidateEventRegion()) {
             // Usually the event region gets updated as a result of paint invalidation. Here we need to request an update explicitly.
             if (auto* layer = enclosingLayer())

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -6686 +6686 @@
 void RenderLayer::invalidateEventRegion()
 {
-    if (auto* compositingLayer = enclosingCompositingLayerForRepaint())
-        compositingLayer->setNeedsCompositingConfigurationUpdate();
+#if PLATFORM(IOS_FAMILY)
+    auto* compositingLayer = enclosingCompositingLayerForRepaint();
+    if (!compositingLayer)
+        return;
+
+    auto maintainsEventRegion = [&] {
+        // UI side scroll overlap testing.
+        if (!compositingLayer->isRenderViewLayer())
+            return true;
+#if ENABLE(POINTER_EVENTS)
+        // UI side touch-action resolution.
+        if (renderer().document().touchActionElements())
+            return true;
+#endif
+        return false;
+    };
+
+    if (!maintainsEventRegion())
+        return;
+
+    compositingLayer->setNeedsCompositingConfigurationUpdate();
+#endif
 }
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -2487 +2487 @@
         m_owningLayer.setNeedsCompositingConfigurationUpdate();
 
+    m_owningLayer.invalidateEventRegion();
+
     auto& frameView = renderer().view().frameView();
     if (m_isMainFrameRenderViewLayer && frameView.isTrackingRepaints())
@@ -2524 +2526 @@
     if (!m_owningLayer.isRenderViewLayer())
         m_owningLayer.setNeedsCompositingConfigurationUpdate();
+
+    m_owningLayer.invalidateEventRegion();
 
     FloatRect pixelSnappedRectForPainting = snapRectToDevicePixels(r, deviceScaleFactor());