Title: [245795] trunk/Source/WebKit
Revision
245795
Author
[email protected]
Date
2019-05-27 09:19:06 -0700 (Mon, 27 May 2019)

Log Message

[Pointer Events] Test at pointerevents/ios/touch-action-none-in-overflow-scrolling-touch.html times out
https://bugs.webkit.org/show_bug.cgi?id=198275
<rdar://problem/50618496>

Patch by Antoine Quint <[email protected]> on 2019-05-27
Reviewed by Antti Koivisto.

Only WKCompositingView instances may have associated touch-action data, so we should filter out any hit-testing view
that isn't a WKCompositingView when finding the view that should hit-test when looking for touch-action information.

* UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:
(WebKit::touchActionsForPoint):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (245794 => 245795)


--- trunk/Source/WebKit/ChangeLog	2019-05-27 16:06:06 UTC (rev 245794)
+++ trunk/Source/WebKit/ChangeLog	2019-05-27 16:19:06 UTC (rev 245795)
@@ -1,3 +1,17 @@
+2019-05-27  Antoine Quint  <[email protected]>
+
+        [Pointer Events] Test at pointerevents/ios/touch-action-none-in-overflow-scrolling-touch.html times out
+        https://bugs.webkit.org/show_bug.cgi?id=198275
+        <rdar://problem/50618496>
+
+        Reviewed by Antti Koivisto.
+
+        Only WKCompositingView instances may have associated touch-action data, so we should filter out any hit-testing view
+        that isn't a WKCompositingView when finding the view that should hit-test when looking for touch-action information.
+
+        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:
+        (WebKit::touchActionsForPoint):
+
 2019-05-27  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.25.1 release

Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm (245794 => 245795)


--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm	2019-05-27 16:06:06 UTC (rev 245794)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm	2019-05-27 16:19:06 UTC (rev 245795)
@@ -98,8 +98,17 @@
     if (viewsAtPoint.isEmpty())
         return { WebCore::TouchAction::Auto };
 
-    auto *hitView = viewsAtPoint.last();
+    UIView *hitView;
+    for (auto *view : WTF::makeReversedRange(viewsAtPoint)) {
+        if ([view isKindOfClass:[WKCompositingView class]]) {
+            hitView = view;
+            break;
+        }
+    }
 
+    if (!hitView)
+        return { WebCore::TouchAction::Auto };
+
     CGPoint hitViewPoint = [hitView convertPoint:point fromView:rootView];
 
     auto* node = RemoteLayerTreeNode::forCALayer(hitView.layer);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to