Title: [278735] branches/safari-612.1.18-branch/Source/WebKit
- Revision
- 278735
- Author
- rubent...@apple.com
- Date
- 2021-06-10 15:19:21 -0700 (Thu, 10 Jun 2021)
Log Message
Cherry-pick r278727. rdar://problem/79161529
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 <timothy_hor...@apple.com> 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).
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278727 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.18-branch/Source/WebKit/ChangeLog (278734 => 278735)
--- branches/safari-612.1.18-branch/Source/WebKit/ChangeLog 2021-06-10 21:54:36 UTC (rev 278734)
+++ branches/safari-612.1.18-branch/Source/WebKit/ChangeLog 2021-06-10 22:19:21 UTC (rev 278735)
@@ -1,3 +1,38 @@
+2021-06-10 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r278727. rdar://problem/79161529
+
+ 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 <timothy_hor...@apple.com> 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).
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278727 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-06-10 Tim Horton <timothy_hor...@apple.com>
+
+ 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 Adrian Perez de Castro <ape...@igalia.com>
Non-unified build fixes, early May 2021 edition
Modified: branches/safari-612.1.18-branch/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.h (278734 => 278735)
--- branches/safari-612.1.18-branch/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.h 2021-06-10 21:54:36 UTC (rev 278734)
+++ branches/safari-612.1.18-branch/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.h 2021-06-10 22:19:21 UTC (rev 278735)
@@ -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: branches/safari-612.1.18-branch/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm (278734 => 278735)
--- branches/safari-612.1.18-branch/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm 2021-06-10 21:54:36 UTC (rev 278734)
+++ branches/safari-612.1.18-branch/Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm 2021-06-10 22:19:21 UTC (rev 278735)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
