Changeset 242830 in webkit

Timestamp:

Mar 12, 2019, 3:35:36 PM (6 years ago)

Author:

Antti Koivisto

Message:

Compositing layer that renders two positioned elements should not hit test
​https://bugs.webkit.org/show_bug.cgi?id=195371
<rdar://problem/48649586>

Reviewed by Simon Fraser.

Followup to fix the test case (fast/scrolling/ios/overflow-scroll-overlap-2.html)

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::setEventRegion):

Revert a last minute change (that was done to fix a Mac displaylist test).

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::paintIntoLayer):

Compute the region on iOS only for now (it is not used on other platforms).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-12  Antti Koivisto  <antti@apple.com>
+
+        Compositing layer that renders two positioned elements should not hit test
+        https://bugs.webkit.org/show_bug.cgi?id=195371
+        <rdar://problem/48649586>
+
+        Reviewed by Simon Fraser.
+
+        Followup to fix the test case (fast/scrolling/ios/overflow-scroll-overlap-2.html)
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::setEventRegion):
+
+        Revert a last minute change (that was done to fix a Mac displaylist test).
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::paintIntoLayer):
+
+        Compute the region on iOS only for now (it is not used on other platforms).
+
 2019-03-12  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -991 +991 @@
 
     GraphicsLayer::setEventRegion(WTFMove(eventRegion));
-    noteLayerPropertyChanged(EventRegionChanged, DontScheduleFlush);
+    noteLayerPropertyChanged(EventRegionChanged, m_isCommittingChanges ? DontScheduleFlush : ScheduleFlush);
 }
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -2577 +2577 @@
     RenderLayer::LayerPaintingInfo paintingInfo(&m_owningLayer, paintDirtyRect, paintBehavior, -m_subpixelOffsetFromRenderer);
 
+#if PLATFORM(IOS_FAMILY)
     auto eventRegion = std::make_unique<Region>();
     paintingInfo.eventRegion = eventRegion.get();
+#endif
 
     m_owningLayer.paintLayerContents(context, paintingInfo, paintFlags);
 
+#if PLATFORM(IOS_FAMILY)
     paintingInfo.eventRegion = nullptr;
     // Use null event region to indicate the entire layer is sensitive to events (the common case).
@@ -2590 +2593 @@
         eventRegion->translate(roundedIntSize(contentOffsetInCompositingLayer()));
     m_graphicsLayer->setEventRegion(WTFMove(eventRegion));
+#endif
 
     if (m_owningLayer.containsDirtyOverlayScrollbars())