Title: [258342] trunk
Revision
258342
Author
[email protected]
Date
2020-03-12 11:18:10 -0700 (Thu, 12 Mar 2020)

Log Message

REGRESSION (r257938): Some pointerevents/ios/touch-action-region tests started to fail
https://bugs.webkit.org/show_bug.cgi?id=209005
<rdar://problem/60337239>

Reviewed by Tim Horton, Wenson Hsieh.

Source/WebCore:

We need to continue to paint event regions if there are touch-action elements.

Tested by existing tests.

* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateEventRegion):

LayoutTests:

New baselines for tests with overflow:scroll, where the scrolled container gets
a rectangular event region.

* pointerevents/ios/touch-action-region-backing-sharing-expected.txt:
* pointerevents/ios/touch-action-region-overflow-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (258341 => 258342)


--- trunk/LayoutTests/ChangeLog	2020-03-12 18:15:43 UTC (rev 258341)
+++ trunk/LayoutTests/ChangeLog	2020-03-12 18:18:10 UTC (rev 258342)
@@ -1,3 +1,17 @@
+2020-03-12  Simon Fraser  <[email protected]>
+
+        REGRESSION (r257938): Some pointerevents/ios/touch-action-region tests started to fail
+        https://bugs.webkit.org/show_bug.cgi?id=209005
+        <rdar://problem/60337239>
+
+        Reviewed by Tim Horton, Wenson Hsieh.
+
+        New baselines for tests with overflow:scroll, where the scrolled container gets
+        a rectangular event region.
+
+        * pointerevents/ios/touch-action-region-backing-sharing-expected.txt:
+        * pointerevents/ios/touch-action-region-overflow-expected.txt:
+
 2020-03-12  Jacob Uphoff  <[email protected]>
 
         Fixed expectations for two tests from 'Pass Failure' to 'Pass ImageOnlyFailure'

Modified: trunk/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt (258341 => 258342)


--- trunk/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt	2020-03-12 18:15:43 UTC (rev 258341)
+++ trunk/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt	2020-03-12 18:18:10 UTC (rev 258342)
@@ -18,6 +18,9 @@
           (children 1
             (GraphicsLayer
               (bounds 200.00 200.00)
+              (event region
+                (rect (0,0) width=200 height=200)
+              )
               (children 1
                 (GraphicsLayer
                   (anchor 0.00 0.00)

Modified: trunk/LayoutTests/pointerevents/ios/touch-action-region-overflow-expected.txt (258341 => 258342)


--- trunk/LayoutTests/pointerevents/ios/touch-action-region-overflow-expected.txt	2020-03-12 18:15:43 UTC (rev 258341)
+++ trunk/LayoutTests/pointerevents/ios/touch-action-region-overflow-expected.txt	2020-03-12 18:18:10 UTC (rev 258342)
@@ -18,6 +18,9 @@
           (children 1
             (GraphicsLayer
               (bounds 200.00 200.00)
+              (event region
+                (rect (0,0) width=200 height=200)
+              )
               (children 1
                 (GraphicsLayer
                   (anchor 0.00 0.00)
@@ -46,6 +49,9 @@
             (GraphicsLayer
               (bounds origin 150.00 150.00)
               (bounds 200.00 200.00)
+              (event region
+                (rect (0,0) width=200 height=200)
+              )
               (children 1
                 (GraphicsLayer
                   (scrollOffset (150,150))
@@ -78,6 +84,9 @@
               (position 25.00 25.00)
               (bounds origin 150.00 150.00)
               (bounds 200.00 200.00)
+              (event region
+                (rect (0,0) width=200 height=200)
+              )
               (children 1
                 (GraphicsLayer
                   (offsetFromRenderer width=25 height=25)

Modified: trunk/Source/WebCore/ChangeLog (258341 => 258342)


--- trunk/Source/WebCore/ChangeLog	2020-03-12 18:15:43 UTC (rev 258341)
+++ trunk/Source/WebCore/ChangeLog	2020-03-12 18:18:10 UTC (rev 258342)
@@ -1,3 +1,18 @@
+2020-03-12  Simon Fraser  <[email protected]>
+
+        REGRESSION (r257938): Some pointerevents/ios/touch-action-region tests started to fail
+        https://bugs.webkit.org/show_bug.cgi?id=209005
+        <rdar://problem/60337239>
+
+        Reviewed by Tim Horton, Wenson Hsieh.
+
+        We need to continue to paint event regions if there are touch-action elements.
+
+        Tested by existing tests.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateEventRegion):
+
 2020-03-12  youenn fablet  <[email protected]>
 
         FrameLoader should own its FrameLoaderClient

Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (258341 => 258342)


--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2020-03-12 18:15:43 UTC (rev 258341)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2020-03-12 18:18:10 UTC (rev 258342)
@@ -1622,12 +1622,14 @@
 #if PLATFORM(IOS_FAMILY)
     hasTouchActionElements = renderer().document().mayHaveElementsWithNonAutoTouchAction();
 #endif
-    if (m_owningLayer.isRenderViewLayer() && !hasTouchActionElements)
-        return;
+    if (!hasTouchActionElements) {
+        if (m_owningLayer.isRenderViewLayer())
+            return;
 
-    auto& settings = renderer().settings();
-    if (!settings.asyncFrameScrollingEnabled() && !settings.asyncOverflowScrollingEnabled())
-        return;
+        auto& settings = renderer().settings();
+        if (!settings.asyncFrameScrollingEnabled() && !settings.asyncOverflowScrollingEnabled())
+            return;
+    }
 
     auto updateEventRegionForLayer = [&](GraphicsLayer& graphicsLayer) {
         GraphicsContext nullContext(nullptr);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to