Attachment 361784 Details for Bug 194531 – Patch

[patch] Patch

bug-194531-20190212102701.patch (text/plain), 2.81 KB, created by Antoine Quint on 2019-02-12 01:27:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2019-02-12 01:27:02 PST

Size: 2.81 KB

patch

obsolete

>Subversion Revision: 241288
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 4d18124dfe1f44683aaa7077a6350b8acf9c7d07..0bb2be45ace2806f23cd6a6abdf41955531bb286 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-02-12  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!).
>+
>+        * Platform/spi/ios/UIKitSPI.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView cancelPointersForGestureRecognizer:]):
>+
> 2019-02-11  Alex Christensen  <achristensen@webkit.org>
> 
>         Remove noisy and unnecessary logs added in r241223
>diff --git a/Source/WebKit/Platform/spi/ios/UIKitSPI.h b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>index 104da183934610c92d49529e5207d5342748833c..c69f1479bd7d590d54cd8d05de3cf9289b096fd9 100644
>--- a/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>+++ b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>@@ -766,6 +766,7 @@ struct _UIWebTouchEvent {
> @property (nonatomic, readonly) CGPoint locationInWindow;
> @property (nonatomic, readonly) UIWebTouchEventType type;
> @property (nonatomic, readonly) const struct _UIWebTouchEvent *lastTouchEvent;
>+@property (nonatomic, readonly) NSMapTable<NSNumber *, UITouch *> *activeTouchesByIdentifier;
> @end
> 
> typedef NS_ENUM(NSInteger, _UIBackdropViewStylePrivate) {
>@@ -1032,11 +1033,6 @@ typedef NSInteger UICompositingMode;
> 
> #endif // USE(APPLE_INTERNAL_SDK)
> 
>-// FIXME: <rdar://problem/47714562>
>-@interface UIWebTouchEventsGestureRecognizer (Staging_47634092)
>-@property (nonatomic, readonly) NSMapTable<NSNumber *, UITouch *> *activeTouchesByIdentifier;
>-@end
>-
> @interface UIGestureRecognizer (Staging_45970040)
> @property (nonatomic, readonly, getter=_modifierFlags) UIKeyModifierFlags modifierFlags;
> @end
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index 52fac5fd56c7cd816258edd174eb895179ebe108..25cb0381584ead2e565e43d69b48f3e07e8f56d9 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -1147,10 +1147,6 @@ - (BOOL)resignFirstResponderForWebView
> #if ENABLE(POINTER_EVENTS)
> - (void)cancelPointersForGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
> {
>-    // FIXME: <rdar://problem/47714562>
>-    if (![_touchEventGestureRecognizer respondsToSelector:@selector(activeTouchesByIdentifier)])
>-        return;
>-
>     NSMapTable<NSNumber *, UITouch *> *activeTouches = [_touchEventGestureRecognizer activeTouchesByIdentifier];
>     for (NSNumber *touchIdentifier in activeTouches) {
>         UITouch *touch = [activeTouches objectForKey:touchIdentifier];

Actions: View | Formatted Diff | Diff

Attachments on bug 194531: 361784 | 361787 | 362631