Title: [245424] branches/safari-608.1.24-branch
- Revision
- 245424
- Author
- kocsen_ch...@apple.com
- Date
- 2019-05-16 16:27:43 -0700 (Thu, 16 May 2019)
Log Message
Revert r245175. rdar://problem/50584991
Modified Paths
Removed Paths
Diff
Modified: branches/safari-608.1.24-branch/LayoutTests/ChangeLog (245423 => 245424)
--- branches/safari-608.1.24-branch/LayoutTests/ChangeLog 2019-05-16 23:27:40 UTC (rev 245423)
+++ branches/safari-608.1.24-branch/LayoutTests/ChangeLog 2019-05-16 23:27:43 UTC (rev 245424)
@@ -1,5 +1,9 @@
2019-05-16 Kocsen Chung <kocsen_ch...@apple.com>
+ Revert r245175. rdar://problem/50584991
+
+2019-05-16 Kocsen Chung <kocsen_ch...@apple.com>
+
Revert r245181. rdar://problem/50670806
2019-05-16 Kocsen Chung <kocsen_ch...@apple.com>
Deleted: branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt (245423 => 245424)
--- branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt 2019-05-16 23:27:40 UTC (rev 245423)
+++ branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt 2019-05-16 23:27:43 UTC (rev 245424)
@@ -1,57 +0,0 @@
-(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)
- )
- )
- )
- )
-)
-
Deleted: branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html (245423 => 245424)
--- branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html 2019-05-16 23:27:40 UTC (rev 245423)
+++ branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html 2019-05-16 23:27:43 UTC (rev 245424)
@@ -1,21 +0,0 @@
-<!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 (245423 => 245424)
--- branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 23:27:40 UTC (rev 245423)
+++ branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 23:27:43 UTC (rev 245424)
@@ -1,5 +1,9 @@
2019-05-16 Kocsen Chung <kocsen_ch...@apple.com>
+ Revert r245175. rdar://problem/50584991
+
+2019-05-16 Kocsen Chung <kocsen_ch...@apple.com>
+
Revert r245181. rdar://problem/50670806
2019-05-16 Kocsen Chung <kocsen_ch...@apple.com>
Modified: branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (245423 => 245424)
--- branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-05-16 23:27:40 UTC (rev 245423)
+++ branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-05-16 23:27:43 UTC (rev 245424)
@@ -1493,9 +1493,6 @@
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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
