Changeset 245268 in webkit

Timestamp:

May 13, 2019, 7:25:34 PM (7 years ago)

Author:

Wenson Hsieh

Message:

[iOS] When running layout tests that tap in the same location, subsequent tests fail to fire click handlers
​https://bugs.webkit.org/show_bug.cgi?id=197821
<rdar://problem/50700512>

Reviewed by Tim Horton.

Source/WebKit:

After r244775, when running back-to-back layout tests on iOS that simulate taps in the same location, the double
tap gesture recognizer for recognizing double clicks ends up recognizing instead of the single tap gesture
recognizer in the subsequent test. This means that click handlers in the subsequent test will fail to recognize,
unless the element with the click handler is also accompanied by a dblclick handler.

To avoid this, we reset the double click gesture recognizer when navigating; this has the additional effect of
making it such that the second page doesn't end up observing a dblclick when the first click was only sent to
the first page.

• UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::didStartProvisionalLoadForMainFrame):

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView setupInteraction]):
(-[WKContentView _didStartProvisionalLoadForMainFrame]):

LayoutTests:

Removes workarounds in a couple of existing layout tests.

• editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html:
• editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html (modified) (1 diff)
• LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] When running layout tests that tap in the same location, subsequent tests fail to fire click handlers
+        https://bugs.webkit.org/show_bug.cgi?id=197821
+        <rdar://problem/50700512>
+
+        Reviewed by Tim Horton.
+
+        Removes workarounds in a couple of existing layout tests.
+
+        * editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html:
+        * editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html:
+
 2019-05-13  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html

@@ -43 +43 @@
 
         await UIHelper.activateElement(clickTarget);
-
-        setTimeout(async function () {
-            // The test is done, but we need to tap again to ensure we don't
-            // hang the next test with a double tap.
-            document.removeEventListener("selectionchange", didChangeSelection);
-            await UIHelper.tapAt(10, 500);
-
-            testRunner.notifyDone();
-        }, 0);
+        setTimeout(() => testRunner.notifyDone(), 0);
     }
     </script>

trunk/LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html

@@ -42 +42 @@
         clickTarget.addEventListener("click", event => {
             event.preventDefault();
-
-            setTimeout(async function () {
-                // The test is done, but we need to tap again to ensure we don't
-                // hang the next test with a double tap.
-                document.removeEventListener("selectionchange", didChangeSelection);
-                await UIHelper.tapAt(10, 500);
-
-                testRunner.notifyDone();
-            }, 0);
+            setTimeout(() => testRunner.notifyDone(), 0);
         });
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] When running layout tests that tap in the same location, subsequent tests fail to fire click handlers
+        https://bugs.webkit.org/show_bug.cgi?id=197821
+        <rdar://problem/50700512>
+
+        Reviewed by Tim Horton.
+
+        After r244775, when running back-to-back layout tests on iOS that simulate taps in the same location, the double
+        tap gesture recognizer for recognizing double clicks ends up recognizing instead of the single tap gesture
+        recognizer in the subsequent test. This means that click handlers in the subsequent test will fail to recognize,
+        unless the element with the click handler is also accompanied by a dblclick handler.
+
+        To avoid this, we reset the double click gesture recognizer when navigating; this has the additional effect of
+        making it such that the second page doesn't end up observing a dblclick when the first click was only sent to
+        the first page.
+
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::didStartProvisionalLoadForMainFrame):
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]):
+        (-[WKContentView _didStartProvisionalLoadForMainFrame]):
+
 2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm

@@ -216 +216 @@
 {
     [m_webView _didStartProvisionalLoadForMainFrame];
+    [m_contentView _didStartProvisionalLoadForMainFrame];
     [m_webView _hidePasswordView];
 }

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

@@ -507 +507 @@
 - (void)_handleAutocorrectionContext:(const WebKit::WebAutocorrectionContext&)context;
 
+- (void)_didStartProvisionalLoadForMainFrame;
+
 @end
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -739 +739 @@
     [_doubleTapGestureRecognizerForDoubleClick setNumberOfTapsRequired:2];
     [_doubleTapGestureRecognizerForDoubleClick setDelegate:self];
-    [_doubleTapGestureRecognizerForDoubleClick setEnabled:YES];
     [self addGestureRecognizer:_doubleTapGestureRecognizerForDoubleClick.get()];
 
@@ -3761 +3760 @@
 {
     [self _invokePendingAutocorrectionContextHandler:[WKAutocorrectionContext autocorrectionContextWithWebContext:context]];
+}
+
+- (void)_didStartProvisionalLoadForMainFrame
+{
+    // Reset the double tap gesture recognizer to prevent any double click that is in the process of being recognized.
+    [_doubleTapGestureRecognizerForDoubleClick setEnabled:NO];
+    [_doubleTapGestureRecognizerForDoubleClick setEnabled:YES];
 }