Attachment 359825 Details for Bug 193687 – Patch for landing

[patch] Patch for landing

bug-193687-20190122175705.patch (text/plain), 2.57 KB, created by Megan Gardner on 2019-01-22 17:57:05 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Megan Gardner

Created: 2019-01-22 17:57:05 PST

Size: 2.57 KB

patch

obsolete

>Subversion Revision: 240297
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 89afd9d745b6039267b833958ef847a4942dff08..67307541e4451945fccc012f8f39d640078a72cc 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-01-22  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Cancel Web Touches Properly so that long presses on YouTube links do not incorrectly trigger a load
>+        https://bugs.webkit.org/show_bug.cgi?id=193687
>+        <rdar://problem/47056717>
>+
>+        Reviewed by Tim Horton.
>+
>+        Cancel web gestures when a long press is recognized.
>+
>+        * Platform/spi/ios/UIKitSPI.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView _cancelWebGestureRecognizer]):
>+        (-[WKContentView _longPressRecognized:]):
>+
> 2019-01-22  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix more builds.
>diff --git a/Source/WebKit/Platform/spi/ios/UIKitSPI.h b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>index 7a8e870b9524e95998ce1ed1de8cdb310d3a7b94..b5c3e34c21cc09dc0cd3ea8c4d7aff2e58fb45db 100644
>--- a/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>+++ b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>@@ -758,6 +758,7 @@ struct _UIWebTouchEvent {
> 
> @interface UIWebTouchEventsGestureRecognizer ()
> - (id)initWithTarget:(id)target action:(SEL)action touchDelegate:(id <UIWebTouchEventsGestureRecognizerDelegate>)delegate;
>+- (void)cancel;
> @property (nonatomic, getter=isDefaultPrevented) BOOL defaultPrevented;
> @property (nonatomic, readonly) BOOL inJavaScriptGesture;
> @property (nonatomic, readonly) CGPoint locationInWindow;
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index 66818c6eae8971c7a4c0e260599c357ff1a836c8..d3f9f12efc6943bc0a41985b2faa0779ef34b535 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -1348,6 +1348,13 @@ - (void)_cancelLongPressGestureRecognizer
>     [_highlightLongPressGestureRecognizer cancel];
> }
> 
>+- (void)_cancelTouchEventGestureRecognizer
>+{
>+#if HAVE(CANCEL_WEB_TOUCH_EVENTS_GESTURE)
>+    [_touchEventGestureRecognizer cancel];
>+#endif
>+}
>+
> - (void)_didScroll
> {
>     [self _cancelLongPressGestureRecognizer];
>@@ -1979,6 +1986,7 @@ - (void)_longPressRecognized:(UILongPressGestureRecognizer *)gestureRecognizer
> {
>     ASSERT(gestureRecognizer == _longPressGestureRecognizer);
>     [self _resetIsDoubleTapPending];
>+    [self _cancelTouchEventGestureRecognizer];
> 
>     _lastInteractionLocation = gestureRecognizer.startPoint;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 193687: 359780 | 359786 | 359791 | 359825