[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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@245268 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b10fe02..604e407 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+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>
[WebAuthN] InvalidStateError should be reported to sites
diff --git a/LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html b/LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html
index 2c8197c..39465b0 100644
--- a/LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html
+++ b/LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html
@@ -42,15 +42,7 @@
window.getSelection().setBaseAndExtent(target, 0, target, 6);
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>
</head>
diff --git a/LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html b/LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html
index 5ba42ac..e38f4d3 100644
--- a/LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html
+++ b/LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html
@@ -41,15 +41,7 @@
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);
});
var target = document.getElementById("target");
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 7344bcf..447dc47 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,5 +1,29 @@
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>
+
Unreviewed, fix some deprecation warnings when using a recent SDK
* UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
index 67fb2e3..09532ff 100644
--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
@@ -215,6 +215,7 @@
void PageClientImpl::didStartProvisionalLoadForMainFrame()
{
[m_webView _didStartProvisionalLoadForMainFrame];
+ [m_contentView _didStartProvisionalLoadForMainFrame];
[m_webView _hidePasswordView];
}
diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
index cf48911..c92b3f9 100644
--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
@@ -506,6 +506,8 @@
- (void)_handleAutocorrectionContext:(const WebKit::WebAutocorrectionContext&)context;
+- (void)_didStartProvisionalLoadForMainFrame;
+
@end
@interface WKContentView (WKTesting)
diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
index e6b1123..5c6653a 100644
--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
@@ -738,7 +738,6 @@
_doubleTapGestureRecognizerForDoubleClick = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognizedForDoubleClick:)]);
[_doubleTapGestureRecognizerForDoubleClick setNumberOfTapsRequired:2];
[_doubleTapGestureRecognizerForDoubleClick setDelegate:self];
- [_doubleTapGestureRecognizerForDoubleClick setEnabled:YES];
[self addGestureRecognizer:_doubleTapGestureRecognizerForDoubleClick.get()];
[self _createAndConfigureDoubleTapGestureRecognizer];
@@ -3762,6 +3761,13 @@
[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];
+}
+
#if !USE(UIKIT_KEYBOARD_ADDITIONS)
- (NSArray *)keyCommands
{
