fast/forms/ios/zoom-after-input-tap-wide-input.html is timing out
https://bugs.webkit.org/show_bug.cgi?id=206313
Reviewed by Wenson Hsieh.
The timeout was caused by the previous test, fast/forms/ios/validation-bubble-dismiss-on-tap.html,
which puts up a validation bubble whose implementation involves showing a modal UIViewController.
That view controller disappears with an animation, which happened after we're proceeded to the next
test, and the overlay view could intercept touches thus breaking any subsequent touch-based test.
Fix by having platformResetStateToConsistentValues() wait for the presentedViewController to
go to nil, which requires spinning the runloop.
platformResetStateToConsistentValues() will return false if we fail to remove the presented view controller,
which will trigger a timeout with a log.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
(WTR::TestController::platformResetStateToConsistentValues):
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::TestController::cocoaResetStateToConsistentValues):
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformResetStateToConsistentValues):
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformResetStateToConsistentValues):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254699 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index be8eef5..b6cd985 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,32 @@
+2020-01-16 Simon Fraser <simon.fraser@apple.com>
+
+ fast/forms/ios/zoom-after-input-tap-wide-input.html is timing out
+ https://bugs.webkit.org/show_bug.cgi?id=206313
+
+ Reviewed by Wenson Hsieh.
+
+ The timeout was caused by the previous test, fast/forms/ios/validation-bubble-dismiss-on-tap.html,
+ which puts up a validation bubble whose implementation involves showing a modal UIViewController.
+ That view controller disappears with an animation, which happened after we're proceeded to the next
+ test, and the overlay view could intercept touches thus breaking any subsequent touch-based test.
+
+ Fix by having platformResetStateToConsistentValues() wait for the presentedViewController to
+ go to nil, which requires spinning the runloop.
+
+ platformResetStateToConsistentValues() will return false if we fail to remove the presented view controller,
+ which will trigger a timeout with a log.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues):
+ (WTR::TestController::platformResetStateToConsistentValues):
+ * WebKitTestRunner/TestController.h:
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::TestController::cocoaResetStateToConsistentValues):
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::platformResetStateToConsistentValues):
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::platformResetStateToConsistentValues):
+
2020-01-16 Philippe Normand <philn@igalia.com>
[GStreamer][WPE] Client-side video rendering support
diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
index 5cacc9c..ecb882f 100644
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
@@ -1086,7 +1086,8 @@
setHidden(false);
- platformResetStateToConsistentValues(options);
+ if (!platformResetStateToConsistentValues(options))
+ return false;
m_shouldDecideNavigationPolicyAfterDelay = false;
m_shouldDecideResponsePolicyAfterDelay = false;
@@ -3086,8 +3087,9 @@
return context;
}
-void TestController::platformResetStateToConsistentValues(const TestOptions&)
+bool TestController::platformResetStateToConsistentValues(const TestOptions&)
{
+ return true;
}
unsigned TestController::imageCountInGeneralPasteboard() const
diff --git a/Tools/WebKitTestRunner/TestController.h b/Tools/WebKitTestRunner/TestController.h
index 3e385f7..d7aacc6 100644
--- a/Tools/WebKitTestRunner/TestController.h
+++ b/Tools/WebKitTestRunner/TestController.h
@@ -358,7 +358,8 @@
void platformCreateWebView(WKPageConfigurationRef, const TestOptions&);
static PlatformWebView* platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef, const TestOptions&);
void platformResetPreferencesToConsistentValues();
- void platformResetStateToConsistentValues(const TestOptions&);
+ // Returns false if the reset timed out.
+ bool platformResetStateToConsistentValues(const TestOptions&);
#if PLATFORM(COCOA)
void cocoaPlatformInitialize();
void cocoaResetStateToConsistentValues(const TestOptions&);
diff --git a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
index b0c3255..bf00494 100644
--- a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
+++ b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
@@ -262,7 +262,7 @@
[platformView resetInteractionCallbacks];
}
- [globalWebsiteDataStoreDelegateClient setAllowRaisingQuota: true];
+ [globalWebsiteDataStoreDelegateClient setAllowRaisingQuota:YES];
}
void TestController::platformWillRunTest(const TestInvocation& testInvocation)
diff --git a/Tools/WebKitTestRunner/ios/TestControllerIOS.mm b/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
index 81bd1e9..bd34a36 100644
--- a/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
+++ b/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
@@ -142,7 +142,7 @@
[(__bridge WKPreferences *)preferences _setShouldIgnoreMetaViewport:NO];
}
-void TestController::platformResetStateToConsistentValues(const TestOptions& options)
+bool TestController::platformResetStateToConsistentValues(const TestOptions& options)
{
cocoaResetStateToConsistentValues(options);
@@ -193,8 +193,28 @@
runUntil(isDoneWaitingForKeyboardToDismiss, m_currentInvocation->shortTimeout());
runUntil(isDoneWaitingForMenuToDismiss, m_currentInvocation->shortTimeout());
+ if (PlatformWebView* platformWebView = mainWebView()) {
+ TestRunnerWKWebView *webView = platformWebView->platformView();
+ UIViewController *webViewController = [[webView window] rootViewController];
+
+ MonotonicTime waitEndTime = MonotonicTime::now() + m_currentInvocation->shortTimeout();
+
+ bool hasPresentedViewController = !![webViewController presentedViewController];
+ while (hasPresentedViewController && MonotonicTime::now() < waitEndTime) {
+ [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
+ hasPresentedViewController = !![webViewController presentedViewController];
+ }
+
+ if (hasPresentedViewController) {
+ TestInvocation::dumpWebProcessUnresponsiveness("TestController::platformResetPreferencesToConsistentValues - Failed to remove presented view controller\n");
+ return false;
+ }
+ }
+
if (shouldRestoreFirstResponder)
[mainWebView()->platformView() becomeFirstResponder];
+
+ return true;
}
void TestController::platformConfigureViewForTest(const TestInvocation& test)
diff --git a/Tools/WebKitTestRunner/mac/TestControllerMac.mm b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
index 3e54f2b..8c59555 100644
--- a/Tools/WebKitTestRunner/mac/TestControllerMac.mm
+++ b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
@@ -110,13 +110,15 @@
{
}
-void TestController::platformResetStateToConsistentValues(const TestOptions& options)
+bool TestController::platformResetStateToConsistentValues(const TestOptions& options)
{
cocoaResetStateToConsistentValues(options);
while ([NSApp nextEventMatchingMask:NSEventMaskGesture | NSEventMaskScrollWheel untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES]) {
// Clear out (and ignore) any pending gesture and scroll wheel events.
}
+
+ return true;
}
void TestController::updatePlatformSpecificTestOptionsForTest(TestOptions& options, const std::string&) const
