Changeset 270849 in webkit

Timestamp:

Dec 15, 2020 10:00:55 AM (19 months ago)

Author:

Devin Rousso

Message:

Toggling pointer-events on body does not re-enable scrolling on child
​https://bugs.webkit.org/show_bug.cgi?id=218533
<rdar://problem/71009746>

Reviewed by Simon Fraser.

Source/WebCore:

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::changeRequiresRecompositeLayer const):
Changes to the CSS pointer-events property should also also indicate that a recomposite is
required (StyleDifference::RecompositeLayer), resulting in RenderElement::styleWillChange
being called, which invalidates the event region since the value of the CSS pointer-events
property has changed.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::layerStyleChanged):
Don't limit StyleDifference::RecompositeLayer changes to only affect RenderWidget.

LayoutTests:

• fast/scrolling/ios/overflow-scroll-pointer-events.html: Added.
• fast/scrolling/ios/overflow-scroll-pointer-events-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/scrolling/ios/overflow-scroll-pointer-events-expected.txt (added)
• LayoutTests/fast/scrolling/ios/overflow-scroll-pointer-events.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-12-15  Devin Rousso  <drousso@apple.com>
+
+        Toggling pointer-events on body does not re-enable scrolling on child
+        https://bugs.webkit.org/show_bug.cgi?id=218533
+        <rdar://problem/71009746>
+
+        Reviewed by Simon Fraser.
+
+        * fast/scrolling/ios/overflow-scroll-pointer-events.html: Added.
+        * fast/scrolling/ios/overflow-scroll-pointer-events-expected.txt: Added.
+
 2020-12-15  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-15  Devin Rousso  <drousso@apple.com>
+
+        Toggling pointer-events on body does not re-enable scrolling on child
+        https://bugs.webkit.org/show_bug.cgi?id=218533
+        <rdar://problem/71009746>
+
+        Reviewed by Simon Fraser.
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::changeRequiresRecompositeLayer const):
+        Changes to the CSS `pointer-events` property should also also indicate that a recomposite is
+        required (`StyleDifference::RecompositeLayer`), resulting in `RenderElement::styleWillChange`
+        being called, which invalidates the event region since the value of the CSS `pointer-events`
+        property has changed.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::layerStyleChanged):
+        Don't limit `StyleDifference::RecompositeLayer` changes to only affect `RenderWidget`.
+
 2020-12-15  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1682 +1682 @@
     }
 
-    // This is necessary to get iframe layers hooked up in response to scheduleInvalidateStyleAndLayerComposition().
-    if (diff == StyleDifference::RecompositeLayer && layer.isComposited() && is<RenderWidget>(layer.renderer()))
-        layer.setNeedsCompositingConfigurationUpdate();
+    if (diff == StyleDifference::RecompositeLayer && layer.isComposited()) {
+        if (oldStyle && oldStyle->pointerEvents() != newStyle.pointerEvents())
+            layer.setNeedsCompositingConfigurationUpdate();
+        else if (is<RenderWidget>(layer.renderer())) {
+            // This is necessary to get iframe layers hooked up in response to scheduleInvalidateStyleAndLayerComposition().
+            layer.setNeedsCompositingConfigurationUpdate();
+        }
+    }
 
     if (diff >= StyleDifference::RecompositeLayer && oldStyle && recompositeChangeRequiresGeometryUpdate(*oldStyle, newStyle)) {

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -1168 +1168 @@
 bool RenderStyle::changeRequiresRecompositeLayer(const RenderStyle& other, OptionSet<StyleDifferenceContextSensitiveProperty>&) const
 {
+    if (m_inheritedFlags.pointerEvents != other.m_inheritedFlags.pointerEvents)
+        return true;
+
     if (m_rareNonInheritedData.ptr() != other.m_rareNonInheritedData.ptr()) {
         if (m_rareNonInheritedData->transformStyle3D != other.m_rareNonInheritedData->transformStyle3D