Title: [289968] trunk/Source/WebKit
- Revision
- 289968
- Author
- timothy_hor...@apple.com
- Date
- 2022-02-16 15:07:16 -0800 (Wed, 16 Feb 2022)
Log Message
Add an additions point for `shouldRecognizeSimultaneouslyWithGestureRecognizer`
https://bugs.webkit.org/show_bug.cgi?id=236724
Reviewed by Wenson Hsieh.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _shouldAdditionallyRecognizeGestureRecognizer:simultaneouslyWithGestureRecognizer:]):
(-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (289967 => 289968)
--- trunk/Source/WebKit/ChangeLog 2022-02-16 22:56:57 UTC (rev 289967)
+++ trunk/Source/WebKit/ChangeLog 2022-02-16 23:07:16 UTC (rev 289968)
@@ -1,3 +1,14 @@
+2022-02-16 Tim Horton <timothy_hor...@apple.com>
+
+ Add an additions point for `shouldRecognizeSimultaneouslyWithGestureRecognizer`
+ https://bugs.webkit.org/show_bug.cgi?id=236724
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _shouldAdditionallyRecognizeGestureRecognizer:simultaneouslyWithGestureRecognizer:]):
+ (-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
+
2022-02-16 Adrian Perez de Castro <ape...@igalia.com>
[CMake] Cannot find OpenGL when system provides opengl.pc instead of gl.pc
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (289967 => 289968)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2022-02-16 22:56:57 UTC (rev 289967)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2022-02-16 23:07:16 UTC (rev 289968)
@@ -2498,6 +2498,15 @@
return (a == x && b == y) || (b == x && a == y);
}
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions_SimultaneousRecognitionExtras.mm>)
+#import <WebKitAdditions/WKContentViewInteractionAdditions_SimultaneousRecognitionExtras.mm>
+#else
+- (BOOL)_shouldAdditionallyRecognizeGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer simultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+ return NO;
+}
+#endif
+
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer*)otherGestureRecognizer
{
for (WKDeferringGestureRecognizer *gesture in self.deferringGestures) {
@@ -2574,6 +2583,9 @@
return YES;
#endif
+ if ([self _shouldAdditionallyRecognizeGestureRecognizer:gestureRecognizer simultaneouslyWithGestureRecognizer:otherGestureRecognizer])
+ return YES;
+
return NO;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
