Changeset 248717 in webkit

Timestamp:

Aug 15, 2019 9:34:00 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

WKUIDelegate's webView:contextMenuDidEndForElement: should be called when context menus end
​https://bugs.webkit.org/show_bug.cgi?id=200750
<rdar://problem/54232261> and <rdar://problem/52355829>

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-08-15
Reviewed by Tim Horton.

Source/WebKit:

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView contextMenuInteraction:willEndForConfiguration:animator:]):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/ContextMenus.mm:

(-[TestContextMenuUIDelegate webView:contextMenuConfigurationForElement:completionHandler:]):
(-[TestContextMenuUIDelegate webView:contextMenuForElement:willCommitWithAnimator:]):
(-[TestContextMenuUIDelegate webView:contextMenuDidEndForElement:]):
(contextMenuWebViewDriver):
(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/ContextMenus.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-15  Alex Christensen  <achristensen@webkit.org>
+
+        WKUIDelegate's webView:contextMenuDidEndForElement: should be called when context menus end
+        https://bugs.webkit.org/show_bug.cgi?id=200750
+        <rdar://problem/54232261> and <rdar://problem/52355829>
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView contextMenuInteraction:willEndForConfiguration:animator:]):
+
 2019-08-14  Brian Burg  <bburg@apple.com>
 

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

@@ -8370 +8370 @@
     // FIXME: This delegate is being called more than once by UIKit. <rdar://problem/51550291>
     // This conditional avoids the WKUIDelegate being called twice too.
-    if (!_contextMenuElementInfo) {
+    if (_contextMenuElementInfo) {
         auto uiDelegate = static_cast<id<WKUIDelegatePrivate>>(_webView.UIDelegate);
         if ([uiDelegate respondsToSelector:@selector(webView:contextMenuDidEndForElement:)])

trunk/Tools/ChangeLog

@@ +1 @@
+2019-08-15  Alex Christensen  <achristensen@webkit.org>
+
+        WKUIDelegate's webView:contextMenuDidEndForElement: should be called when context menus end
+        https://bugs.webkit.org/show_bug.cgi?id=200750
+        <rdar://problem/54232261> and <rdar://problem/52355829>
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ContextMenus.mm:
+        (-[TestContextMenuUIDelegate webView:contextMenuConfigurationForElement:completionHandler:]):
+        (-[TestContextMenuUIDelegate webView:contextMenuForElement:willCommitWithAnimator:]):
+        (-[TestContextMenuUIDelegate webView:contextMenuDidEndForElement:]):
+        (contextMenuWebViewDriver):
+        (TEST):
+
 2019-08-14  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

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

@@ -35 +35 @@
 #import <WebKit/WebKit.h>
 
+static bool contextMenuRequested;
 static bool willPresentCalled;
-static bool contextMenuRequested;
+static bool willCommitCalled;
+static bool didEndCalled;
 static RetainPtr<NSURL> simpleURL;
 
@@ -48 +50 @@
     EXPECT_TRUE([elementInfo.linkURL.absoluteString isEqualToString:[simpleURL absoluteString]]);
     contextMenuRequested = true;
-    completionHandler([UIContextMenuConfiguration configurationWithIdentifier:nil previewProvider:nil actionProvider:nil]);
+    UIContextMenuContentPreviewProvider previewProvider = ^UIViewController * ()
+    {
+        return [UIViewController new];
+    };
+    UIContextMenuActionProvider actionProvider = ^UIMenu *(NSArray<UIMenuElement *> *suggestedActions)
+    {
+        return [UIMenu menuWithTitle:@"" children:suggestedActions];
+    };
+    completionHandler([UIContextMenuConfiguration configurationWithIdentifier:nil previewProvider:previewProvider actionProvider:actionProvider]);
 }
 
@@ -58 +68 @@
 - (void)webView:(WKWebView *)webView contextMenuForElement:(WKContextMenuElementInfo *)elementInfo willCommitWithAnimator:(id<UIContextMenuInteractionCommitAnimating>)animator
 {
+    willCommitCalled = true;
 }
 
 - (void)webView:(WKWebView *)webView contextMenuDidEndForElement:(WKContextMenuElementInfo *)elementInfo
 {
+    didEndCalled = true;
 }
 
 @end
 
-TEST(WebKit, DISABLED_ContextMenuBasic)
+static RetainPtr<TestContextMenuDriver> contextMenuWebViewDriver()
 {
-    auto window = adoptNS([[UIWindow alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
-    auto driver = adoptNS([TestContextMenuDriver new]);
-    auto uiDelegate = adoptNS([TestContextMenuUIDelegate new]);
-    auto configuration = adoptNS([WKWebViewConfiguration new]);
+    static auto window = adoptNS([[UIWindow alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+    static auto driver = adoptNS([TestContextMenuDriver new]);
+    static auto uiDelegate = adoptNS([TestContextMenuUIDelegate new]);
+    static auto configuration = adoptNS([WKWebViewConfiguration new]);
     [configuration _setClickInteractionDriverForTesting:(id<_UIClickInteractionDriving>)driver.get()];
-    auto webViewController = adoptNS([[TestWKWebViewController alloc] initWithFrame:CGRectMake(0, 0, 200, 200) configuration:configuration.get()]);
+    static auto webViewController = adoptNS([[TestWKWebViewController alloc] initWithFrame:CGRectMake(0, 0, 200, 200) configuration:configuration.get()]);
     TestWKWebView *webView = [webViewController webView];
     [window addSubview:webView];
     [webView setUIDelegate:uiDelegate.get()];
-
     simpleURL = [[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
     [webView synchronouslyLoadHTMLString:[NSString stringWithFormat:@"<a href='%@'>This is a link</a>", simpleURL.get()]];
+    return driver;
+}
+
+TEST(WebKit, ContextMenuClick)
+{
+    auto driver = contextMenuWebViewDriver();
     [driver begin:^(BOOL result) {
-        if (result) {
-            [driver clickDown];
-            [driver clickUp];
-            [driver end];
-        }
+        EXPECT_TRUE(result);
+        [driver clickDown];
+        [driver clickUp];
     }];
     TestWebKitAPI::Util::run(&willPresentCalled);
+    EXPECT_TRUE(contextMenuRequested);
+    EXPECT_TRUE(willPresentCalled);
+    EXPECT_FALSE(willCommitCalled);
+    EXPECT_FALSE(didEndCalled);
 }
 
+TEST(WebKit, ContextMenuEnd)
+{
+    auto driver = contextMenuWebViewDriver();
+    [driver begin:^(BOOL result) {
+        EXPECT_TRUE(result);
+        [driver end];
+    }];
+    TestWebKitAPI::Util::run(&didEndCalled);
+    EXPECT_TRUE(contextMenuRequested);
+    EXPECT_FALSE(willPresentCalled);
+    EXPECT_FALSE(willCommitCalled);
+    EXPECT_TRUE(didEndCalled);
+}
 #endif // PLATFORM(IOS) && USE(UICONTEXTMENU)