Attachment 362631 Details for Bug 194531 – Patch

[patch] Patch

bug-194531-20190221215132.patch (text/plain), 3.25 KB, created by Antoine Quint on 2019-02-21 12:51:33 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2019-02-21 12:51:33 PST

Size: 3.25 KB

patch

obsolete

>Subversion Revision: 241875
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 4ecf7736ec6fd4a2ff0799e188231d5c38d5185c..bad533b7860711d9710d388f08ac50d5fd28e357 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-02-21  Antoine Quint  <graouts@apple.com>
>+
>+        Move UIWebTouchEventsGestureRecognizer.activeTouchesByIdentifier to SPI
>+        https://bugs.webkit.org/show_bug.cgi?id=194531
>+        <rdar://problem/47714562>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Follow-up commit to ensure this SPI is only called on newer versions of iOS.
>+
>+        * wtf/Platform.h:
>+
> 2019-02-21  Dean Jackson  <dino@apple.com>
> 
>         Rotation animations sometimes use the wrong origin (affects apple.com)
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 4cfd434b7dacad40c08524bf282633aea3395739..3ef3caf24eac6102525019ddbff63f226f9c5eb8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-02-21  Antoine Quint  <graouts@apple.com>
>+
>+        Move UIWebTouchEventsGestureRecognizer.activeTouchesByIdentifier to SPI
>+        https://bugs.webkit.org/show_bug.cgi?id=194531
>+        <rdar://problem/47714562>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Follow-up commit to ensure this SPI is only called on newer versions of iOS.
>+
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView cancelPointersForGestureRecognizer:]):
>+
> 2019-02-21  Chris Dumez  <cdumez@apple.com>
> 
>         Unreviewed API test fix after r241855.
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 0ac31dd0cfeab7eeeffb91a0531c1d264912abc5..9bfac4227817ef21f681302ab9479b8c17268d81 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -1512,3 +1512,7 @@
> #elif PLATFORM(IOS_FAMILY)
> #define ENABLE_MONOSPACE_FONT_EXCEPTION (__IPHONE_OS_VERSION_MIN_REQUIRED < 130000)
> #endif
>+
>+#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
>+#define HAVE_UI_WEB_TOUCH_EVENTS_GESTURE_RECOGNIZER_WITH_ACTIVE_TOUCHES_BY_ID 1
>+#endif
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index b60da74cc87c896b36289a37bf1936d3156ccbe8..a2ee9e5e7c1798bb49eb7b8a8165718ea1db33e0 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -1188,16 +1188,15 @@ - (BOOL)resignFirstResponderForWebView
> #if ENABLE(POINTER_EVENTS)
> - (void)cancelPointersForGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
> {
>+#if HAVE(UI_WEB_TOUCH_EVENTS_GESTURE_RECOGNIZER_WITH_ACTIVE_TOUCHES_BY_ID)
>     // FIXME: <rdar://problem/48035706>
>-    if (![_touchEventGestureRecognizer respondsToSelector:@selector(activeTouchesByIdentifier)])
>-        return;
>-
>     NSMapTable<NSNumber *, UITouch *> *activeTouches = [_touchEventGestureRecognizer activeTouchesByIdentifier];
>     for (NSNumber *touchIdentifier in activeTouches) {
>         UITouch *touch = [activeTouches objectForKey:touchIdentifier];
>         if ([touch.gestureRecognizers containsObject:gestureRecognizer])
>             _page->cancelPointer([touchIdentifier unsignedIntValue], WebCore::roundedIntPoint([touch locationInView:self]));
>     }
>+#endif
> }
> #endif
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194531: 361784 | 361787 | 362631