Title: [243709] trunk
- Revision
- 243709
- Author
- [email protected]
- Date
- 2019-04-01 12:53:00 -0700 (Mon, 01 Apr 2019)
Log Message
Update event region when toggling pointer-events:none
https://bugs.webkit.org/show_bug.cgi?id=195902
<rdar://problem/48988384>
Reviewed by Simon Fraser.
Source/WebCore:
Test: fast/scrolling/ios/event-region-pointer-events.html
Normally paint invalidation requests compositing configuration update whenever anything that would
affect event region changes. However mutating 'pointer-events' property does not cause paint invalidation.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::styleWillChange):
Request compositing update explicitly from the containing layer.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::invalidateEventRegion):
* rendering/RenderLayer.h:
LayoutTests:
* fast/scrolling/ios/event-region-pointer-events-expected.txt: Added.
* fast/scrolling/ios/event-region-pointer-events.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (243708 => 243709)
--- trunk/LayoutTests/ChangeLog 2019-04-01 19:51:09 UTC (rev 243708)
+++ trunk/LayoutTests/ChangeLog 2019-04-01 19:53:00 UTC (rev 243709)
@@ -1,3 +1,14 @@
+2019-04-01 Antti Koivisto <[email protected]>
+
+ Update event region when toggling pointer-events:none
+ https://bugs.webkit.org/show_bug.cgi?id=195902
+ <rdar://problem/48988384>
+
+ Reviewed by Simon Fraser.
+
+ * fast/scrolling/ios/event-region-pointer-events-expected.txt: Added.
+ * fast/scrolling/ios/event-region-pointer-events.html: Added.
+
2019-04-01 Chris Dumez <[email protected]>
Support "noreferrer" for window.open()
Added: trunk/LayoutTests/fast/scrolling/ios/event-region-pointer-events-expected.txt (0 => 243709)
--- trunk/LayoutTests/fast/scrolling/ios/event-region-pointer-events-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/scrolling/ios/event-region-pointer-events-expected.txt 2019-04-01 19:53:00 UTC (rev 243709)
@@ -0,0 +1,99 @@
+
+
+ Before:
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 3
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 200.00 200.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 212.00 8.00)
+ (bounds 202.00 202.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 416.00 8.00)
+ (bounds 202.00 202.00)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+After setting 'pointer-events:auto':
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 673.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 673.00)
+ (contentsOpaque 1)
+ (children 3
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 200.00 200.00)
+ (drawsContent 1)
+ (event region
+ (rect (0,0) width=200 height=200)
+ )
+ )
+ (GraphicsLayer
+ (position 212.00 8.00)
+ (bounds 202.00 202.00)
+ (drawsContent 1)
+ (event region
+ (rect (2,2) width=200 height=200)
+ )
+ )
+ (GraphicsLayer
+ (position 416.00 8.00)
+ (bounds 202.00 202.00)
+ (drawsContent 1)
+ (event region
+ (rect (2,2) width=200 height=200)
+ )
+ )
+ )
+ )
+ )
+)
+After setting 'pointer-events:none':
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 1205.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 1205.00)
+ (contentsOpaque 1)
+ (children 3
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 200.00 200.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 212.00 8.00)
+ (bounds 202.00 202.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 416.00 8.00)
+ (bounds 202.00 202.00)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
Added: trunk/LayoutTests/fast/scrolling/ios/event-region-pointer-events.html (0 => 243709)
--- trunk/LayoutTests/fast/scrolling/ios/event-region-pointer-events.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/ios/event-region-pointer-events.html 2019-04-01 19:53:00 UTC (rev 243709)
@@ -0,0 +1,58 @@
+<html>
+<style>
+.testdiv {
+ display: inline-block;
+ box-sizing: border-box;
+ border: 2px solid blue;
+ position: relative;
+ height: 200px;
+ width: 200px;
+ will-change: transform;
+}
+.inner {
+ height: 200px;
+ width: 200px;
+ background-color: green;
+}
+
+</style>
+<script>
+window._onload_ = function () {
+ if (!window.internals)
+ return;
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ results.innerText = "Before:\n\n"
+ results.innerText += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_EVENT_REGION);
+
+ test1.style.pointerEvents = "auto";
+ test2.style.pointerEvents = "auto";
+ test3.style.pointerEvents = "auto";
+
+ results.innerText += "After setting 'pointer-events:auto':\n\n"
+ results.innerText += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_EVENT_REGION);
+
+ test1.style.pointerEvents = "none";
+ test2.style.pointerEvents = "none";
+ test3.style.pointerEvents = "none";
+
+ results.innerText += "After setting 'pointer-events:none':\n\n"
+ results.innerText += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_EVENT_REGION);
+}
+</script>
+<body>
+<div class="testdiv" id="test1" style="pointer-events:none">
+</div>
+<div class="testdiv" style="pointer-events:none">
+ <div id="test2" class="inner"></div>
+</div>
+<div class="testdiv" style="pointer-events:none">
+ <div class="inner" style="position:relative">
+ <div id="test3" class="inner"></div>
+ </div>
+</div>
+
+<pre id="results"></pre>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (243708 => 243709)
--- trunk/Source/WebCore/ChangeLog 2019-04-01 19:51:09 UTC (rev 243708)
+++ trunk/Source/WebCore/ChangeLog 2019-04-01 19:53:00 UTC (rev 243709)
@@ -1,3 +1,25 @@
+2019-04-01 Antti Koivisto <[email protected]>
+
+ Update event region when toggling pointer-events:none
+ https://bugs.webkit.org/show_bug.cgi?id=195902
+ <rdar://problem/48988384>
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/scrolling/ios/event-region-pointer-events.html
+
+ Normally paint invalidation requests compositing configuration update whenever anything that would
+ affect event region changes. However mutating 'pointer-events' property does not cause paint invalidation.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::styleWillChange):
+
+ Request compositing update explicitly from the containing layer.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::invalidateEventRegion):
+ * rendering/RenderLayer.h:
+
2019-04-01 Chris Dumez <[email protected]>
Support "noreferrer" for window.open()
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (243708 => 243709)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2019-04-01 19:51:09 UTC (rev 243708)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2019-04-01 19:53:00 UTC (rev 243709)
@@ -730,6 +730,12 @@
}
}
+ if (m_style.pointerEvents() != newStyle.pointerEvents()) {
+ // Usually the event region gets updated as a result of paint invalidation. Here we need to request an update explicitly.
+ if (auto* layer = enclosingLayer())
+ layer->invalidateEventRegion();
+ }
+
if (m_parent && (newStyle.outlineSize() < m_style.outlineSize() || shouldRepaintForStyleDifference(diff)))
repaint();
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (243708 => 243709)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2019-04-01 19:51:09 UTC (rev 243708)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2019-04-01 19:53:00 UTC (rev 243709)
@@ -6662,6 +6662,12 @@
return false;
}
+void RenderLayer::invalidateEventRegion()
+{
+ if (auto* compositingLayer = enclosingCompositingLayerForRepaint())
+ compositingLayer->setNeedsCompositingConfigurationUpdate();
+}
+
TextStream& operator<<(TextStream& ts, const RenderLayer& layer)
{
ts << "RenderLayer " << &layer << " " << layer.size();
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (243708 => 243709)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2019-04-01 19:51:09 UTC (rev 243708)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2019-04-01 19:53:00 UTC (rev 243709)
@@ -865,6 +865,8 @@
WEBCORE_EXPORT bool isTransparentOrFullyClippedRespectingParentFrames() const;
+ void invalidateEventRegion();
+
private:
void setNextSibling(RenderLayer* next) { m_next = next; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
