Title: [278727] trunk/Source/WebKit
- Revision
- 278727
- Author
- [email protected]
- Date
- 2021-06-10 13:47:16 -0700 (Thu, 10 Jun 2021)
Log Message
REGRESSION (r277820): Trackpad interaction in Web Content is not working on iOS or macCatalyst
https://bugs.webkit.org/show_bug.cgi?id=226892
<rdar://79080057>
Patch by Tim Horton <[email protected]> on 2021-06-10
Reviewed by Wenson Hsieh.
* UIProcess/ios/WKMouseGestureRecognizer.h:
* UIProcess/ios/WKMouseGestureRecognizer.mm:
Stop inheriting from UIHoverGestureRecognizer; since r277820
removed our override of _shouldReceiveTouch, and the default implementation
always says NO, r277820 broke trackpad-origiating mouse events (but
left hover working, since that is not a touch).
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (278726 => 278727)
--- trunk/Source/WebKit/ChangeLog 2021-06-10 20:17:19 UTC (rev 278726)
+++ trunk/Source/WebKit/ChangeLog 2021-06-10 20:47:16 UTC (rev 278727)
@@ -1,3 +1,18 @@
+2021-06-10 Tim Horton <[email protected]>
+
+ REGRESSION (r277820): Trackpad interaction in Web Content is not working on iOS or macCatalyst
+ https://bugs.webkit.org/show_bug.cgi?id=226892
+ <rdar://79080057>
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/WKMouseGestureRecognizer.h:
+ * UIProcess/ios/WKMouseGestureRecognizer.mm:
+ Stop inheriting from UIHoverGestureRecognizer; since r277820
+ removed our override of _shouldReceiveTouch, and the default implementation
+ always says NO, r277820 broke trackpad-origiating mouse events (but
+ left hover working, since that is not a touch).
+
2021-06-10 Chris Dumez <[email protected]>
Do some hardening in XPCServiceEventHandler()
Modified: trunk/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.h (278726 => 278727)
--- trunk/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.h 2021-06-10 20:17:19 UTC (rev 278726)
+++ trunk/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.h 2021-06-10 20:47:16 UTC (rev 278727)
@@ -25,10 +25,10 @@
#if HAVE(UIKIT_WITH_MOUSE_SUPPORT)
-#import <UIKit/UIHoverGestureRecognizer.h>
+#import <UIKit/UIGestureRecognizer.h>
#import "NativeWebMouseEvent.h"
-@interface WKMouseGestureRecognizer : UIHoverGestureRecognizer
+@interface WKMouseGestureRecognizer : UIGestureRecognizer
- (std::optional<CGPoint>)lastMouseLocation;
- (WebKit::NativeWebMouseEvent *)lastMouseEvent;
Modified: trunk/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm (278726 => 278727)
--- trunk/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm 2021-06-10 20:17:19 UTC (rev 278726)
+++ trunk/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm 2021-06-10 20:47:16 UTC (rev 278727)
@@ -50,17 +50,6 @@
return modifiers;
}
-#if HAVE(UI_HOVER_EVENT_RESPONDABLE)
-@interface UIHoverGestureRecognizer () <_UIHoverEventRespondable>
-#else
-@interface UIHoverGestureRecognizer ()
-- (void)_hoverEntered:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
-- (void)_hoverMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
-- (void)_hoverExited:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
-- (void)_hoverCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
-#endif
-@end
-
@implementation WKMouseGestureRecognizer {
RetainPtr<UIEvent> _currentHoverEvent;
RetainPtr<UITouch> _currentTouch;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
