Title: [245379] branches/safari-608.1.24-branch
- Revision
- 245379
- Author
- [email protected]
- Date
- 2019-05-15 22:43:11 -0700 (Wed, 15 May 2019)
Log Message
Cherry-pick r245175. rdar://problem/50584991
Event region generation needs to know about backing-sharing
https://bugs.webkit.org/show_bug.cgi?id=197694
<rdar://problem/50584991>
Reviewed by Simon Fraser.
Source/WebCore:
Test: pointerevents/ios/touch-action-region-backing-sharing.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateEventRegion):
Gather event region from backing sharing layers too.
LayoutTests:
* platform/ios-wk2/TestExpectations:
* pointerevents/ios/touch-action-region-backing-sharing-expected.txt: Added.
* pointerevents/ios/touch-action-region-backing-sharing.html: Added.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245175 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Added Paths
Diff
Modified: branches/safari-608.1.24-branch/LayoutTests/ChangeLog (245378 => 245379)
--- branches/safari-608.1.24-branch/LayoutTests/ChangeLog 2019-05-16 05:43:07 UTC (rev 245378)
+++ branches/safari-608.1.24-branch/LayoutTests/ChangeLog 2019-05-16 05:43:11 UTC (rev 245379)
@@ -1,3 +1,43 @@
+2019-05-15 Kocsen Chung <[email protected]>
+
+ Cherry-pick r245175. rdar://problem/50584991
+
+ Event region generation needs to know about backing-sharing
+ https://bugs.webkit.org/show_bug.cgi?id=197694
+ <rdar://problem/50584991>
+
+ Reviewed by Simon Fraser.
+
+ Source/WebCore:
+
+ Test: pointerevents/ios/touch-action-region-backing-sharing.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateEventRegion):
+
+ Gather event region from backing sharing layers too.
+
+ LayoutTests:
+
+ * platform/ios-wk2/TestExpectations:
+ * pointerevents/ios/touch-action-region-backing-sharing-expected.txt: Added.
+ * pointerevents/ios/touch-action-region-backing-sharing.html: Added.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245175 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-05-10 Antti Koivisto <[email protected]>
+
+ Event region generation needs to know about backing-sharing
+ https://bugs.webkit.org/show_bug.cgi?id=197694
+ <rdar://problem/50584991>
+
+ Reviewed by Simon Fraser.
+
+ * platform/ios-wk2/TestExpectations:
+ * pointerevents/ios/touch-action-region-backing-sharing-expected.txt: Added.
+ * pointerevents/ios/touch-action-region-backing-sharing.html: Added.
+
2019-05-15 Alan Coon <[email protected]>
Revert r245025. rdar://problem/50753129
Added: branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt (0 => 245379)
--- branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt (rev 0)
+++ branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt 2019-05-16 05:43:11 UTC (rev 245379)
@@ -0,0 +1,57 @@
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (deep color 1)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (event region
+ (rect (0,0) width=800 height=600)
+ )
+ (deep color 1)
+ (children 2
+ (GraphicsLayer
+ (position 8.00 13.00)
+ (bounds 200.00 200.00)
+ (event region
+ (rect (0,0) width=500 height=500)
+ )
+ (deep color 1)
+ (children 1
+ (GraphicsLayer
+ (bounds 200.00 200.00)
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 500.00 500.00)
+ (drawsContent 1)
+ (deep color 1)
+ )
+ )
+ )
+ )
+ )
+ (GraphicsLayer
+ (position 8.00 13.00)
+ (bounds 150.00 150.00)
+ (drawsContent 1)
+ (event region
+ (rect (0,0) width=100 height=50)
+ (rect (0,50) width=150 height=50)
+ (rect (50,100) width=100 height=50)
+ (touch-action
+ (none
+ (rect (0,0) width=100 height=50)
+ (rect (0,50) width=150 height=50)
+ (rect (50,100) width=100 height=50)
+ )
+ )
+ )
+ (deep color 1)
+ )
+ )
+ )
+ )
+)
+
Added: branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html (0 => 245379)
--- branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html (rev 0)
+++ branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html 2019-05-16 05:43:11 UTC (rev 245379)
@@ -0,0 +1,21 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
+<html>
+<style>
+.scroll { position:absolute; width:200px; height:200px; overflow:scroll }
+.scrollcontent { width:500px; height:500px; background:green; }
+.overlap { position:absolute; width:100px; height:100px; background:blue; touch-action: none; }
+</style>
+<body>
+<div class="scroll"><div class="scrollcontent"></div></div>
+<div class="overlap">
+ <div class="overlap" style="left:50px; top:50px"></div>
+</div>
+<pre id="results"></pre>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+if (window.internals)
+ results.innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_EVENT_REGION);
+</script>
+</body>
+</html>
Modified: branches/safari-608.1.24-branch/Source/WebCore/ChangeLog (245378 => 245379)
--- branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 05:43:07 UTC (rev 245378)
+++ branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 05:43:11 UTC (rev 245379)
@@ -1,5 +1,48 @@
2019-05-15 Kocsen Chung <[email protected]>
+ Cherry-pick r245175. rdar://problem/50584991
+
+ Event region generation needs to know about backing-sharing
+ https://bugs.webkit.org/show_bug.cgi?id=197694
+ <rdar://problem/50584991>
+
+ Reviewed by Simon Fraser.
+
+ Source/WebCore:
+
+ Test: pointerevents/ios/touch-action-region-backing-sharing.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateEventRegion):
+
+ Gather event region from backing sharing layers too.
+
+ LayoutTests:
+
+ * platform/ios-wk2/TestExpectations:
+ * pointerevents/ios/touch-action-region-backing-sharing-expected.txt: Added.
+ * pointerevents/ios/touch-action-region-backing-sharing.html: Added.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245175 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-05-10 Antti Koivisto <[email protected]>
+
+ Event region generation needs to know about backing-sharing
+ https://bugs.webkit.org/show_bug.cgi?id=197694
+ <rdar://problem/50584991>
+
+ Reviewed by Simon Fraser.
+
+ Test: pointerevents/ios/touch-action-region-backing-sharing.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateEventRegion):
+
+ Gather event region from backing sharing layers too.
+
+2019-05-15 Kocsen Chung <[email protected]>
+
Cherry-pick r245156. rdar://problem/50590818
Refine AudioSession route sharing policy
Modified: branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (245378 => 245379)
--- branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-05-16 05:43:07 UTC (rev 245378)
+++ branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-05-16 05:43:11 UTC (rev 245379)
@@ -1443,6 +1443,9 @@
auto paintFlags = RenderLayer::paintLayerPaintingCompositingAllPhasesFlags() | RenderLayer::PaintLayerCollectingEventRegion;
m_owningLayer.paintLayerContents(nullContext, paintingInfo, paintFlags);
+ for (auto& layerWeakPtr : m_backingSharingLayers)
+ layerWeakPtr->paintLayerContents(nullContext, paintingInfo, paintFlags);
+
auto contentOffset = roundedIntSize(contentOffsetInCompositingLayer());
eventRegion.translate(contentOffset);
m_graphicsLayer->setEventRegion(WTFMove(eventRegion));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
