Changeset 274245 in webkit

Timestamp:

Mar 10, 2021, 3:38:53 PM (6 years ago)

Author:

Russell Epstein

Message:

Revert r271193. rdar://problem/75273221

Location:

branches/safari-611.1.21.0-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (5 diffs)
• UIProcess/ios/PageClientImplIOS.h (modified) (1 diff)
• UIProcess/ios/PageClientImplIOS.mm (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.h (modified) (2 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (10 diffs)
• UIProcess/ios/WKDeferringGestureRecognizer.h (modified) (1 diff)
• UIProcess/ios/WKDeferringGestureRecognizer.mm (modified) (1 diff)

branches/safari-611.1.21.0-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-10  Ruben Turcios  <rubent_22@apple.com>
+
+        Revert r271193. rdar://problem/75273221
+
 2021-03-10  Ruben Turcios  <rubent_22@apple.com>
 

branches/safari-611.1.21.0-branch/Source/WebKit/UIProcess/PageClient.h

@@ -340 +340 @@
 #endif
 #if ENABLE(IOS_TOUCH_EVENTS)
-    virtual void doneDeferringTouchStart(bool preventNativeGestures) = 0;
+    virtual void doneDeferringNativeGestures(bool preventNativeGestures) = 0;
 #endif
 

branches/safari-611.1.21.0-branch/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -2915 +2915 @@
     if (touchEventsTrackingType == TrackingType::NotTracking) {
         if (!isHandlingPreventableTouchStart())
-            pageClient().doneDeferringTouchStart(false);
+            pageClient().doneDeferringNativeGestures(false);
         return;
     }
@@ -2930 +2930 @@
         didReceiveEvent(event.type(), false);
         if (!isHandlingPreventableTouchStart())
-            pageClient().doneDeferringTouchStart(false);
+            pageClient().doneDeferringNativeGestures(false);
         return;
     }
@@ -2937 +2937 @@
         ++m_handlingPreventableTouchStartCount;
         Function<void(bool, CallbackBase::Error)> completionHandler = [this, protectedThis = makeRef(*this), event](bool handled, CallbackBase::Error error) {
-            bool didFinishDeferringTouchStart = false;
-            ASSERT_IMPLIES(event.type() == WebEvent::TouchStart, m_handlingPreventableTouchStartCount);
-            if (event.type() == WebEvent::TouchStart && m_handlingPreventableTouchStartCount)
-                didFinishDeferringTouchStart = !--m_handlingPreventableTouchStartCount;
+            ASSERT(m_handlingPreventableTouchStartCount);
+            if (m_handlingPreventableTouchStartCount)
+                --m_handlingPreventableTouchStartCount;
 
             bool handledOrFailedWithError = handled || error != CallbackBase::Error::None || m_handledSynchronousTouchEventWhileDispatchingPreventableTouchStart;
@@ -2951 +2950 @@
             didReceiveEvent(event.type(), handledOrFailedWithError);
             pageClient().doneWithTouchEvent(event, handledOrFailedWithError);
-
-            if (didFinishDeferringTouchStart)
-                pageClient().doneDeferringTouchStart(handledOrFailedWithError);
+            if (!isHandlingPreventableTouchStart())
+                pageClient().doneDeferringNativeGestures(handledOrFailedWithError);
         };
 
@@ -2970 +2968 @@
     pageClient().doneWithTouchEvent(event, handled);
     if (!isHandlingPreventableTouchStart())
-        pageClient().doneDeferringTouchStart(handled);
+        pageClient().doneDeferringNativeGestures(handled);
     else if (handled)
         m_handledSynchronousTouchEventWhileDispatchingPreventableTouchStart = true;

branches/safari-611.1.21.0-branch/Source/WebKit/UIProcess/ios/PageClientImplIOS.h

@@ -113 +113 @@
 #endif
 #if ENABLE(IOS_TOUCH_EVENTS)
-    void doneDeferringTouchStart(bool preventNativeGestures) override;
+    void doneDeferringNativeGestures(bool preventNativeGestures) override;
 #endif
     RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;

branches/safari-611.1.21.0-branch/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm

@@ -448 +448 @@
 #if ENABLE(IOS_TOUCH_EVENTS)
 
-void PageClientImpl::doneDeferringTouchStart(bool preventNativeGestures)
-{
-    [m_contentView _doneDeferringTouchStart:preventNativeGestures];
+void PageClientImpl::doneDeferringNativeGestures(bool preventNativeGestures)
+{
+    [m_contentView _doneDeferringNativeGestures:preventNativeGestures];
 }
 

branches/safari-611.1.21.0-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

@@ -243 +243 @@
 @interface WKContentView () {
 #if ENABLE(IOS_TOUCH_EVENTS)
-    RetainPtr<WKDeferringGestureRecognizer> _touchStartDeferringGestureRecognizerForImmediatelyResettableGestures;
-    RetainPtr<WKDeferringGestureRecognizer> _touchStartDeferringGestureRecognizerForDelayedResettableGestures;
-    RetainPtr<WKDeferringGestureRecognizer> _touchStartDeferringGestureRecognizerForSyntheticTapGestures;
+    RetainPtr<WKDeferringGestureRecognizer> _deferringGestureRecognizerForImmediatelyResettableGestures;
+    RetainPtr<WKDeferringGestureRecognizer> _deferringGestureRecognizerForDelayedResettableGestures;
+    RetainPtr<WKDeferringGestureRecognizer> _deferringGestureRecognizerForSyntheticTapGestures;
 #endif
     RetainPtr<UIWebTouchEventsGestureRecognizer> _touchEventGestureRecognizer;
@@ -540 +540 @@
 #endif
 #if ENABLE(IOS_TOUCH_EVENTS)
-- (void)_doneDeferringTouchStart:(BOOL)preventNativeGestures;
+- (void)_doneDeferringNativeGestures:(BOOL)preventNativeGestures;
 #endif
 - (void)_commitPotentialTapFailed;

branches/safari-611.1.21.0-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -765 +765 @@
 
 #if ENABLE(IOS_TOUCH_EVENTS)
-    _touchStartDeferringGestureRecognizerForImmediatelyResettableGestures = adoptNS([[WKDeferringGestureRecognizer alloc] initWithDeferringGestureDelegate:self]);
-    [_touchStartDeferringGestureRecognizerForImmediatelyResettableGestures setName:@"Touch start deferrer (immediate reset)"];
-
-    _touchStartDeferringGestureRecognizerForDelayedResettableGestures = adoptNS([[WKDeferringGestureRecognizer alloc] initWithDeferringGestureDelegate:self]);
-    [_touchStartDeferringGestureRecognizerForDelayedResettableGestures setName:@"Touch start deferrer (delayed reset)"];
-
-    _touchStartDeferringGestureRecognizerForSyntheticTapGestures = adoptNS([[WKDeferringGestureRecognizer alloc] initWithDeferringGestureDelegate:self]);
-    [_touchStartDeferringGestureRecognizerForSyntheticTapGestures setName:@"Touch start deferrer (synthetic tap)"];
-
-    for (WKDeferringGestureRecognizer *gesture in self._touchStartDeferringGestures) {
+    _deferringGestureRecognizerForImmediatelyResettableGestures = adoptNS([[WKDeferringGestureRecognizer alloc] initWithDeferringGestureDelegate:self]);
+    [_deferringGestureRecognizerForImmediatelyResettableGestures setName:@"Touch event deferrer (immediate reset)"];
+
+    _deferringGestureRecognizerForDelayedResettableGestures = adoptNS([[WKDeferringGestureRecognizer alloc] initWithDeferringGestureDelegate:self]);
+    [_deferringGestureRecognizerForDelayedResettableGestures setName:@"Touch event deferrer (delayed reset)"];
+
+    _deferringGestureRecognizerForSyntheticTapGestures = adoptNS([[WKDeferringGestureRecognizer alloc] initWithDeferringGestureDelegate:self]);
+    [_deferringGestureRecognizerForSyntheticTapGestures setName:@"Touch event deferrer (synthetic tap)"];
+
+    for (WKDeferringGestureRecognizer *gesture in self._deferringGestureRecognizers) {
         gesture.delegate = self;
         [self addGestureRecognizer:gesture];
     }
-#endif // ENABLE(IOS_TOUCH_EVENTS)
+#endif
 
     _touchEventGestureRecognizer = adoptNS([[UIWebTouchEventsGestureRecognizer alloc] initWithTarget:self action:@selector(_webTouchEventsRecognized:) touchDelegate:self]);
@@ -954 +954 @@
 
 #if ENABLE(IOS_TOUCH_EVENTS)
-    for (WKDeferringGestureRecognizer *gesture in self._touchStartDeferringGestures) {
+    for (WKDeferringGestureRecognizer *gesture in self._deferringGestureRecognizers) {
         gesture.delegate = nil;
         [self removeGestureRecognizer:gesture];
@@ -1085 +1085 @@
 {
 #if ENABLE(IOS_TOUCH_EVENTS)
-    for (WKDeferringGestureRecognizer *gesture in self._touchStartDeferringGestures)
+    for (WKDeferringGestureRecognizer *gesture in self._deferringGestureRecognizers)
         [self removeGestureRecognizer:gesture];
 #endif
@@ -1112 +1112 @@
 {
 #if ENABLE(IOS_TOUCH_EVENTS)
-    for (WKDeferringGestureRecognizer *gesture in self._touchStartDeferringGestures)
+    for (WKDeferringGestureRecognizer *gesture in self._deferringGestureRecognizers)
         [self addGestureRecognizer:gesture];
 #endif
@@ -1549 +1549 @@
         if (nativeWebTouchEvent.isPotentialTap() && self.hasHiddenContentEditable && self._hasFocusedElement && !self.window.keyWindow)
             [self.window makeKeyWindow];
-
-#if ENABLE(IOS_TOUCH_EVENTS)
-        if (!_page->isHandlingPreventableTouchStart()) {
-            for (WKDeferringGestureRecognizer *gesture in self._touchStartDeferringGestures) {
-                if (gesture.state == UIGestureRecognizerStatePossible)
-                    gesture.state = UIGestureRecognizerStateFailed;
-            }
-        }
-#endif // ENABLE(IOS_TOUCH_EVENTS)
-    }
-#endif // ENABLE(TOUCH_EVENTS)
+    }
+#endif
 }
 
@@ -1737 +1728 @@
 #if ENABLE(IOS_TOUCH_EVENTS)
 
-- (NSArray<WKDeferringGestureRecognizer *> *)_touchStartDeferringGestures
+- (NSArray<WKDeferringGestureRecognizer *> *)_deferringGestureRecognizers
 {
     WKDeferringGestureRecognizer *recognizers[3];
@@ -1745 +1736 @@
             recognizers[count++] = recognizer.get();
     };
-    add(_touchStartDeferringGestureRecognizerForImmediatelyResettableGestures);
-    add(_touchStartDeferringGestureRecognizerForDelayedResettableGestures);
-    add(_touchStartDeferringGestureRecognizerForSyntheticTapGestures);
+    add(_deferringGestureRecognizerForImmediatelyResettableGestures);
+    add(_deferringGestureRecognizerForDelayedResettableGestures);
+    add(_deferringGestureRecognizerForSyntheticTapGestures);
     return [NSArray arrayWithObjects:recognizers count:count];
 }
 
-- (void)_doneDeferringTouchStart:(BOOL)preventNativeGestures
-{
-    for (WKDeferringGestureRecognizer *gesture in self._touchStartDeferringGestures)
+- (void)_doneDeferringNativeGestures:(BOOL)preventNativeGestures
+{
+    for (WKDeferringGestureRecognizer *gesture in self._deferringGestureRecognizers)
         [gesture setDefaultPrevented:preventNativeGestures];
 }
@@ -2154 +2145 @@
 {
 #if ENABLE(IOS_TOUCH_EVENTS)
-    for (WKDeferringGestureRecognizer *gesture in self._touchStartDeferringGestures) {
+    for (WKDeferringGestureRecognizer *gesture in self._deferringGestureRecognizers) {
         if (isSamePair(gestureRecognizer, otherGestureRecognizer, _touchEventGestureRecognizer.get(), gesture))
             return YES;
@@ -7289 +7280 @@
 }
 
+- (BOOL)deferringGestureRecognizer:(WKDeferringGestureRecognizer *)deferringGestureRecognizer shouldDeferGesturesAfterEndingTouchesWithEvent:(UIEvent *)event
+{
+    return _page->isHandlingPreventableTouchStart();
+}
+
 - (BOOL)deferringGestureRecognizer:(WKDeferringGestureRecognizer *)deferringGestureRecognizer shouldDeferOtherGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
 {
@@ -7340 +7336 @@
     };
 
-    if ([gestureRecognizer isKindOfClass:WKSyntheticTapGestureRecognizer.class])
-        return deferringGestureRecognizer == _touchStartDeferringGestureRecognizerForSyntheticTapGestures;
+    if (gestureRecognizer == _doubleTapGestureRecognizer || gestureRecognizer == _singleTapGestureRecognizer)
+        return deferringGestureRecognizer == _deferringGestureRecognizerForSyntheticTapGestures;
 
     if (mayDelayResetOfContainingSubgraph(gestureRecognizer))
-        return deferringGestureRecognizer == _touchStartDeferringGestureRecognizerForDelayedResettableGestures;
-
-    return deferringGestureRecognizer == _touchStartDeferringGestureRecognizerForImmediatelyResettableGestures;
+        return deferringGestureRecognizer == _deferringGestureRecognizerForDelayedResettableGestures;
+
+    return deferringGestureRecognizer == _deferringGestureRecognizerForImmediatelyResettableGestures;
 #else
     UNUSED_PARAM(deferringGestureRecognizer);

branches/safari-611.1.21.0-branch/Source/WebKit/UIProcess/ios/WKDeferringGestureRecognizer.h

@@ -31 +31 @@
 
 @protocol WKDeferringGestureRecognizerDelegate
+- (BOOL)deferringGestureRecognizer:(WKDeferringGestureRecognizer *)deferringGestureRecognizer shouldDeferGesturesAfterEndingTouchesWithEvent:(UIEvent *)event;
 - (BOOL)deferringGestureRecognizer:(WKDeferringGestureRecognizer *)deferringGestureRecognizer shouldDeferGesturesAfterBeginningTouchesWithEvent:(UIEvent *)event;
 - (BOOL)deferringGestureRecognizer:(WKDeferringGestureRecognizer *)deferringGestureRecognizer shouldDeferOtherGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer;

branches/safari-611.1.21.0-branch/Source/WebKit/UIProcess/ios/WKDeferringGestureRecognizer.mm

@@ -56 +56 @@
 }
 
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    [super touchesEnded:touches withEvent:event];
+
+    if (self.state != UIGestureRecognizerStatePossible)
+        return;
+
+    if ([_deferringGestureDelegate deferringGestureRecognizer:self shouldDeferGesturesAfterEndingTouchesWithEvent:event])
+        return;
+
+    self.state = UIGestureRecognizerStateFailed;
+}
+
 - (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 {