Attachment 373604 Details for Bug 199562 – Patch

[patch] Patch

bug-199562-20190707234745.patch (text/plain), 15.67 KB, created by Antoine Quint on 2019-07-07 14:47:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2019-07-07 14:47:47 PDT

Size: 15.67 KB

patch

obsolete

>Subversion Revision: 247197
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index cebfd627debd4a8d93a786617c89a0550b514696..9a744eeabf57f8fa2576bef99d424ba490a979a8 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-07  Antoine Quint  <graouts@apple.com>
>+
>+        [Pointer Events] Enable only on the most recent version of the supported iOS family
>+        https://bugs.webkit.org/show_bug.cgi?id=199562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2019-07-06  Michael Saboff  <msaboff@apple.com>
> 
>         switch(String) needs to check for exceptions when resolving the string
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 8938a9905328a6f5a02cb7d80b2a79127ee40ccb..065337b3fbc36cf611e63d2f35e5e5b54f031430 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-07-07  Antoine Quint  <graouts@apple.com>
>+
>+        [Pointer Events] Enable only on the most recent version of the supported iOS family
>+        https://bugs.webkit.org/show_bug.cgi?id=199562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We really don't need HAVE_UI_WEB_TOUCH_EVENTS_GESTURE_RECOGNIZER_WITH_ACTIVE_TOUCHES_BY_ID since the UIKit SPI
>+        that was added in iOS 13 that it's checking for is really required for all parts of the implementation of Pointer
>+        Events, including dispatch of the "pointercancel" event and support for the "touch-action" CSS property.
>+
>+        * wtf/Platform.h:
>+
> 2019-07-05  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r247115.
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 313c764a0400edb61ef02fca05787ac3f80d7377..1eaab56e0ec4f58eede9f7cd667b941bf5845a4e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-07  Antoine Quint  <graouts@apple.com>
>+
>+        [Pointer Events] Enable only on the most recent version of the supported iOS family
>+        https://bugs.webkit.org/show_bug.cgi?id=199562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2019-07-06  Simon Fraser  <simon.fraser@apple.com>
> 
>         Long hang when loading a cnn.com page on iOS
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 4406811f6eb73982a456175d5d571e74c336122d..e1950ef3d552bfe63c71adaaa3f744b04e648516 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-07  Antoine Quint  <graouts@apple.com>
>+
>+        [Pointer Events] Enable only on the most recent version of the supported iOS family
>+        https://bugs.webkit.org/show_bug.cgi?id=199562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2019-07-05  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r247159.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 6801a1b1051fc698dde38a45dcd182d74c9c1f1c..2a078d99f2741671057f4772415350d641145487 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-07-07  Antoine Quint  <graouts@apple.com>
>+
>+        [Pointer Events] Enable only on the most recent version of the supported iOS family
>+        https://bugs.webkit.org/show_bug.cgi?id=199562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView cancelPointersForGestureRecognizer:]):
>+        (-[WKContentView activeTouchIdentifierForGestureRecognizer:]):
>+        (-[WKContentView touchActionActiveTouches]):
>+        * UIProcess/ios/WKSyntheticTapGestureRecognizer.m:
>+        (-[WKSyntheticTapGestureRecognizer touchesEnded:withEvent:]):
>+        * UIProcess/ios/WKTouchActionGestureRecognizer.h:
>+        * UIProcess/ios/WKTouchActionGestureRecognizer.mm:
>+        (-[WKTouchActionGestureRecognizer canPreventGestureRecognizer:]):
>+
> 2019-07-06  Antoine Quint  <graouts@apple.com>
> 
>         [Pointer Events] Use a gesture recognizer to prevent pinch-to-zoom behavior
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 0797db0aac26c902ca24c556dbbd6937a5827973..3ccd7455a629ee38f2fe099e3cb9a35e693f987b 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-07  Antoine Quint  <graouts@apple.com>
>+
>+        [Pointer Events] Enable only on the most recent version of the supported iOS family
>+        https://bugs.webkit.org/show_bug.cgi?id=199562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2019-07-03  Sam Weinig  <weinig@apple.com>
> 
>         Adopt simple structured bindings in more places
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index 13ed2c0a96a8b0f61131c76d415ae0e3c0473dde..e4ab80e9aa9a309e356aea2f7aa29f764130fb5e 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -317,7 +317,9 @@ ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphoneos[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphonesimulator[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index b5e63a905eb4540636c244e4f33a2b798726f0c7..b6cf6bcdd44778014b6571b995ba7bcd309f620e 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -1533,10 +1533,6 @@
> #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
>-
> #if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
> #define HAVE_ARKIT_QUICK_LOOK_PREVIEW_ITEM 1
> #endif
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index 13ed2c0a96a8b0f61131c76d415ae0e3c0473dde..e4ab80e9aa9a309e356aea2f7aa29f764130fb5e 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -317,7 +317,9 @@ ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphoneos[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphonesimulator[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
>diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>index 13ed2c0a96a8b0f61131c76d415ae0e3c0473dde..e4ab80e9aa9a309e356aea2f7aa29f764130fb5e 100644
>--- a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>@@ -317,7 +317,9 @@ ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphoneos[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphonesimulator[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
>diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>index 13ed2c0a96a8b0f61131c76d415ae0e3c0473dde..e4ab80e9aa9a309e356aea2f7aa29f764130fb5e 100644
>--- a/Source/WebKit/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>@@ -317,7 +317,9 @@ ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphoneos[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphonesimulator[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index fd3f5d67bf1b040d50fc8f0b9ccf7782e0ae4fd8..fa2df8502c5b2330d73c25436263517088dd9f02 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -1287,28 +1287,22 @@ - (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>
>     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
> }
> 
> - (WTF::Optional<unsigned>)activeTouchIdentifierForGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
> {
>-#if HAVE(UI_WEB_TOUCH_EVENTS_GESTURE_RECOGNIZER_WITH_ACTIVE_TOUCHES_BY_ID)
>-    // FIXME: <rdar://problem/48035706>
>     NSMapTable<NSNumber *, UITouch *> *activeTouches = [_touchEventGestureRecognizer activeTouchesByIdentifier];
>     for (NSNumber *touchIdentifier in activeTouches) {
>         UITouch *touch = [activeTouches objectForKey:touchIdentifier];
>         if ([touch.gestureRecognizers containsObject:gestureRecognizer])
>             return [touchIdentifier unsignedIntValue];
>     }
>-#endif
>     return WTF::nullopt;
> }
> #endif
>@@ -1399,12 +1393,10 @@ - (BOOL)gestureRecognizerMayPinchToZoomWebView:(UIGestureRecognizer *)gestureRec
>     return gestureRecognizer == [_webView scrollView].pinchGestureRecognizer;
> }
> 
>-#if HAVE(UI_WEB_TOUCH_EVENTS_GESTURE_RECOGNIZER_WITH_ACTIVE_TOUCHES_BY_ID)
> - (NSMapTable<NSNumber *, UITouch *> *)touchActionActiveTouches
> {
>     return [_touchEventGestureRecognizer activeTouchesByIdentifier];
> }
>-#endif
> 
> - (void)_resetPanningPreventionFlags
> {
>diff --git a/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m b/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m
>index 3c66527c19d7c673fc9433a7683a8f0dc6cec489..65e4c364942114d6bcb60cba0dcb12f6c5787b7a 100644
>--- a/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m
>+++ b/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.m
>@@ -78,7 +78,7 @@ - (void)reset
> - (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
> {
>     [super touchesEnded:touches withEvent:event];
>-#if ENABLE(POINTER_EVENTS) && HAVE(UI_WEB_TOUCH_EVENTS_GESTURE_RECOGNIZER_WITH_ACTIVE_TOUCHES_BY_ID)
>+#if ENABLE(POINTER_EVENTS)
>     if (!_supportingWebTouchEventsGestureRecognizer)
>         return;
> 
>diff --git a/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.h b/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.h
>index 7ce04dadba55a1cfd3a90119f152423e9c3edca2..4afa34b5b9dd664d964f77cb27e06fea1c1016f6 100644
>--- a/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.h
>+++ b/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.h
>@@ -39,9 +39,7 @@
> 
> @protocol WKTouchActionGestureRecognizerDelegate <NSObject>
> - (BOOL)gestureRecognizerMayPinchToZoomWebView:(UIGestureRecognizer *)gestureRecognizer;
>-#if HAVE(UI_WEB_TOUCH_EVENTS_GESTURE_RECOGNIZER_WITH_ACTIVE_TOUCHES_BY_ID)
> - (NSMapTable<NSNumber *, UITouch *> *)touchActionActiveTouches;
>-#endif
> @end
> 
> #endif
>diff --git a/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.mm b/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.mm
>index 0f6b934c8f3bd6f6313fc2309299e569128509dd..835fc658e7c733d40799635c5ff33c068219b0d7 100644
>--- a/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.mm
>+++ b/Source/WebKit/UIProcess/ios/WKTouchActionGestureRecognizer.mm
>@@ -86,7 +86,6 @@ - (BOOL)canBePreventedByGestureRecognizer:(UIGestureRecognizer *)preventingGestu
>     return NO;
> }
> 
>-#if HAVE(UI_WEB_TOUCH_EVENTS_GESTURE_RECOGNIZER_WITH_ACTIVE_TOUCHES_BY_ID)
> - (BOOL)canPreventGestureRecognizer:(UIGestureRecognizer *)preventedGestureRecognizer
> {
>     if (_touchActionsByTouchIdentifier.isEmpty())
>@@ -111,7 +110,6 @@ - (BOOL)canPreventGestureRecognizer:(UIGestureRecognizer *)preventedGestureRecog
> 
>     return NO;
> }
>-#endif
> 
> @end
> 
>diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>index 13ed2c0a96a8b0f61131c76d415ae0e3c0473dde..e4ab80e9aa9a309e356aea2f7aa29f764130fb5e 100644
>--- a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>@@ -317,7 +317,9 @@ ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphoneos[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphonesimulator[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 822e3ef4e608bffe7da5685a55d7e886f349752e..cccc0b02f5b17a1cd9c067b18c418c369b78199f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-07  Antoine Quint  <graouts@apple.com>
>+
>+        [Pointer Events] Enable only on the most recent version of the supported iOS family
>+        https://bugs.webkit.org/show_bug.cgi?id=199562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
>+
> 2019-07-06  Simon Fraser  <simon.fraser@apple.com>
> 
>         Long hang when loading a cnn.com page on iOS
>diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>index 13ed2c0a96a8b0f61131c76d415ae0e3c0473dde..e4ab80e9aa9a309e356aea2f7aa29f764130fb5e 100644
>--- a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>@@ -317,7 +317,9 @@ ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
> 
> ENABLE_POINTER_EVENTS = $(ENABLE_POINTER_EVENTS_$(WK_PLATFORM_NAME));
> ENABLE_POINTER_EVENTS_iphoneos = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphoneos[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_iphonesimulator = ENABLE_POINTER_EVENTS;
>+ENABLE_POINTER_EVENTS_iphonesimulator[sdk=iphone*12.*] = ;
> ENABLE_POINTER_EVENTS_maccatalyst = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_macosx = ENABLE_POINTER_EVENTS;
> ENABLE_POINTER_EVENTS_watchos = ENABLE_POINTER_EVENTS;

Actions: View | Formatted Diff | Diff

Attachments on bug 199562: 373598 | 373599 | 373600 | 373601 | 373603 | 373604 | 373618 | 373619