Attachment 369548 Details for Bug 197694 – patch

[patch] patch

event-region-backing-sharing-2.patch (text/plain), 6.05 KB, created by Antti Koivisto on 2019-05-10 01:10:30 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2019-05-10 01:10:30 PDT

Size: 6.05 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 245171)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2019-05-10  Antti Koivisto  <antti@apple.com>
>+
>+        Event region generation needs to know about backing-sharing
>+        https://bugs.webkit.org/show_bug.cgi?id=197694
>+        <rdar://problem/50584991>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-09  Simon Fraser  <simon.fraser@apple.com>
> 
>         Implement backing-sharing in compositing layers, allowing overlap layers to paint into the backing store of another layer
>Index: Source/WebCore/rendering/RenderLayerBacking.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderLayerBacking.cpp	(revision 245170)
>+++ Source/WebCore/rendering/RenderLayerBacking.cpp	(working copy)
>@@ -1493,6 +1493,9 @@ void RenderLayerBacking::updateEventRegi
>     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));
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 245170)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2019-05-10  Antti Koivisto  <antti@apple.com>
>+
>+        Event region generation needs to know about backing-sharing
>+        https://bugs.webkit.org/show_bug.cgi?id=197694
>+        <rdar://problem/50584991>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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-09  Simon Fraser  <simon.fraser@apple.com>
> 
>         Implement backing-sharing in compositing layers, allowing overlap layers to paint into the backing store of another layer
>Index: LayoutTests/platform/ios-wk2/TestExpectations
>===================================================================
>--- LayoutTests/platform/ios-wk2/TestExpectations	(revision 245170)
>+++ LayoutTests/platform/ios-wk2/TestExpectations	(working copy)
>@@ -1076,7 +1076,6 @@ webkit.org/b/156620 legacy-animation-eng
> webkit.org/b/153049 perf/array-binary-search.html [ Pass Failure Timeout ]
> 
> fast/scrolling/ios/scroll-events-back-forward-after-pageshow.html [ Pass Failure ]
>-webkit.org/b/197694 fast/scrolling/ios/overflow-scroll-overlap-4.html [ Failure ]
> 
> webkit.org/b/157589 fast/text-autosizing/ios/text-autosizing-after-back.html [ Pass Timeout ]
> 
>Index: LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt
>===================================================================
>--- LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt	(nonexistent)
>+++ LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt	(working copy)
>@@ -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)
>+        )
>+      )
>+    )
>+  )
>+)
>+
>Index: LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html
>===================================================================
>--- LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html	(nonexistent)
>+++ LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html	(working copy)
>@@ -0,0 +1,21 @@
>+<!DOCTYPE html> 
>+<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>

Actions: View | Formatted Diff | Diff

Attachments on bug 197694: 369547 | 369548