Changeset 261192 in webkit

Timestamp:

May 5, 2020 12:25:51 PM (4 years ago)

Author:

Antti Koivisto

Message:

Factor RenderLayerBacking::updateEventRegion skip conditions into a lambda
​https://bugs.webkit.org/show_bug.cgi?id=211450

Reviewed by Simon Fraser.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateEventRegion):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-05  Antti Koivisto  <antti@apple.com>
+
+        Factor RenderLayerBacking::updateEventRegion skip conditions into a lambda
+        https://bugs.webkit.org/show_bug.cgi?id=211450
+
+        Reviewed by Simon Fraser.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateEventRegion):
+
 2020-05-05  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1657 +1657 @@
         return;
 
-    bool needsEventRegionUpdateForNonCompositedFrame = renderer().view().needsEventRegionUpdateForNonCompositedFrame();
-    bool hasTouchActionElements = false;
-    bool hasEditableElements = false;
+    auto needsUpdate = [&] {
+        if (renderer().view().needsEventRegionUpdateForNonCompositedFrame())
+            return true;
+        
 #if PLATFORM(IOS_FAMILY)
-    hasTouchActionElements = renderer().document().mayHaveElementsWithNonAutoTouchAction();
+        if (renderer().document().mayHaveElementsWithNonAutoTouchAction())
+            return true;
 #endif
 #if ENABLE(EDITABLE_REGION)
-    hasEditableElements = renderer().document().mayHaveEditableElements();
-#endif
-    if (!hasTouchActionElements && !hasEditableElements && !needsEventRegionUpdateForNonCompositedFrame) {
+        if (renderer().document().mayHaveEditableElements())
+            return true;
+#endif
         if (m_owningLayer.isRenderViewLayer())
-            return;
+            return false;
 
         auto& settings = renderer().settings();
         if (!settings.asyncFrameScrollingEnabled() && !settings.asyncOverflowScrollingEnabled())
-            return;
-    }
+            return false;
+
+        return true;
+    };
+
+    if (!needsUpdate())
+        return;
 
     auto updateEventRegionForLayer = [&](GraphicsLayer& graphicsLayer) {
@@ -1711 +1718 @@
         updateEventRegionForLayer(*m_scrolledContentsLayer);
 
-    if (needsEventRegionUpdateForNonCompositedFrame)
-        renderer().view().setNeedsEventRegionUpdateForNonCompositedFrame(false);
+    renderer().view().setNeedsEventRegionUpdateForNonCompositedFrame(false);
 }
 #endif