Changeset 245988 in webkit

Timestamp:

May 31, 2019, 3:02:14 PM (7 years ago)

Author:

timothy_horton@apple.com

Message:

REGRESSION: WebKit.InteractionDeadlockAfterCrash and SynchronousTimeoutTests.UnresponsivePageDoesNotCausePositionInformationToHangUI API tests are failing
​https://bugs.webkit.org/show_bug.cgi?id=198432
<rdar://problem/51266033>

Reviewed by Wenson Hsieh.

• TestWebKitAPI/Tests/WebKitCocoa/InteractionDeadlockAfterCrash.mm:

(TEST):
(recursiveFindHighlightLongPressRecognizer): Deleted.

• TestWebKitAPI/Tests/ios/SynchronousTimeoutTests.mm:

(TestWebKitAPI::TEST):
(TestWebKitAPI::recursiveFindHighlightLongPressRecognizer): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/InteractionDeadlockAfterCrash.mm (modified) (3 diffs)
• TestWebKitAPI/Tests/ios/SynchronousTimeoutTests.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-31  Tim Horton  <timothy_horton@apple.com>
+
+        REGRESSION: WebKit.InteractionDeadlockAfterCrash and SynchronousTimeoutTests.UnresponsivePageDoesNotCausePositionInformationToHangUI API tests are failing
+        https://bugs.webkit.org/show_bug.cgi?id=198432
+        <rdar://problem/51266033>
+
+        Reviewed by Wenson Hsieh.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/InteractionDeadlockAfterCrash.mm:
+        (TEST):
+        (recursiveFindHighlightLongPressRecognizer): Deleted.
+        * TestWebKitAPI/Tests/ios/SynchronousTimeoutTests.mm:
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::recursiveFindHighlightLongPressRecognizer): Deleted.
+
 2019-05-31  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InteractionDeadlockAfterCrash.mm

@@ -34 +34 @@
 #import <wtf/RetainPtr.h>
 
-@interface NSObject ()
-
-- (BOOL)hasSelectablePositionAtPoint:(CGPoint)point;
-
-@end
-
 #if PLATFORM(IOS_FAMILY)
 
-static UIGestureRecognizer *recursiveFindHighlightLongPressRecognizer(UIView *view)
-{
-    for (UIGestureRecognizer *recognizer in view.gestureRecognizers) {
-        if ([recognizer isKindOfClass:NSClassFromString(@"_UIWebHighlightLongPressGestureRecognizer")])
-            return recognizer;
-    }
-
-    for (UIView *subview in view.subviews) {
-        UIGestureRecognizer *recognizer = recursiveFindHighlightLongPressRecognizer(subview);
-        if (recognizer)
-            return recognizer;
-    }
-
-    return nil;
-}
+@interface WKContentView ()
+- (BOOL)hasSelectablePositionAtPoint:(CGPoint)point;
+@end
 
 TEST(WebKit, InteractionDeadlockAfterCrash)
@@ -62 +44 @@
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
 
-    RetainPtr<WKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:configuration.get()]);
+    RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:configuration.get()]);
 
     [webView loadHTMLString:@"test" baseURL:nil];
     [webView _test_waitForDidFinishNavigation];
 
-    UIGestureRecognizer *highlightLongPressRecognizer = recursiveFindHighlightLongPressRecognizer(webView.get());
-    UIView *interactionView = highlightLongPressRecognizer.view;
-    EXPECT_NOT_NULL(highlightLongPressRecognizer);
-
     // This will start an asynchronous interaction information update.
-    BOOL shouldBegin = [[highlightLongPressRecognizer delegate] gestureRecognizerShouldBegin:highlightLongPressRecognizer];
-    EXPECT_TRUE(shouldBegin);
+    [webView _simulateLongPressActionAtLocation:CGPointMake(50, 50)];
 
     [webView _killWebContentProcessAndResetState];
@@ -81 +58 @@
 
     // This will synchronously ensure we have up-to-date interaction information.
-    [interactionView hasSelectablePositionAtPoint:CGPointZero];
+    [[webView wkContentView] hasSelectablePositionAtPoint:CGPointZero];
 }
 

trunk/Tools/TestWebKitAPI/Tests/ios/SynchronousTimeoutTests.mm

@@ -33 +33 @@
 #if PLATFORM(IOS_FAMILY)
 
-using namespace TestWebKitAPI;
-
-@interface NSObject ()
-
+@interface WKContentView ()
 - (BOOL)hasSelectablePositionAtPoint:(CGPoint)point;
-
 @end
 
 namespace TestWebKitAPI {
-    
-static UIGestureRecognizer *recursiveFindHighlightLongPressRecognizer(UIView *view)
-{
-    for (UIGestureRecognizer *recognizer in view.gestureRecognizers) {
-        if ([recognizer isKindOfClass:NSClassFromString(@"_UIWebHighlightLongPressGestureRecognizer")])
-            return recognizer;
-    }
-    
-    for (UIView *subview in view.subviews) {
-        UIGestureRecognizer *recognizer = recursiveFindHighlightLongPressRecognizer(subview);
-        if (recognizer)
-            return recognizer;
-    }
-    
-    return nil;
-}
-    
+
 TEST(SynchronousTimeoutTests, UnresponsivePageDoesNotCausePositionInformationToHangUI)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
     [webView synchronouslyLoadTestPageNamed:@"simple"];
-    
-    UIGestureRecognizer *highlightLongPressRecognizer = recursiveFindHighlightLongPressRecognizer(webView.get());
-    UIView *interactionView = highlightLongPressRecognizer.view;
-    EXPECT_NOT_NULL(highlightLongPressRecognizer);
-    
+
     [webView evaluateJavaScript:@"while(1);" completionHandler:nil];
     
     // The test passes if we can long press and still finish the test.
-    [interactionView hasSelectablePositionAtPoint:CGPointMake(100, 100)];
+    [[webView wkContentView] hasSelectablePositionAtPoint:CGPointMake(100, 100)];
 }
 
-    
 } // namespace TestWebKitAPI