Changeset 247321 in webkit

Timestamp:

Jul 10, 2019 1:04:26 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

Context menus are not presented for WKWebViews that don't have UIDelegates
​https://bugs.webkit.org/show_bug.cgi?id=199678

Reviewed by Dean Jackson.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView continueContextMenuInteraction:]):
Remove this unnecessary early-return if we don't have a UIDelegate.
We have a default behavior that we totally want to happen.
Also, rename completion() to continueWithContextMenuConfiguration()
to reduce confusion between completion() and completionBlock() in
this method.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-10  Tim Horton  <timothy_horton@apple.com>
+
+        Context menus are not presented for WKWebViews that don't have UIDelegates
+        https://bugs.webkit.org/show_bug.cgi?id=199678
+
+        Reviewed by Dean Jackson.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView continueContextMenuInteraction:]):
+        Remove this unnecessary early-return if we don't have a UIDelegate.
+        We have a default behavior that we totally want to happen.
+        Also, rename completion() to continueWithContextMenuConfiguration()
+        to reduce confusion between completion() and completionBlock() in
+        this method.
+
 2019-07-10  Commit Queue  <commit-queue@webkit.org>
 

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

@@ -7802 +7802 @@
 }
 
-- (void)continueContextMenuInteraction:(void(^)(UIContextMenuConfiguration *))completion
+- (void)continueContextMenuInteraction:(void(^)(UIContextMenuConfiguration *))continueWithContextMenuConfiguration
 {
     if (!_positionInformation.touchCalloutEnabled)
-        return completion(nil);
+        return continueWithContextMenuConfiguration(nil);
 
     if (!_positionInformation.isLink && !_positionInformation.isImage && !_positionInformation.isAttachment)
-        return completion(nil);
+        return continueWithContextMenuConfiguration(nil);
 
     URL linkURL = _positionInformation.url;
 
     if (_positionInformation.isLink && linkURL.isEmpty())
-        return completion(nil);
+        return continueWithContextMenuConfiguration(nil);
 
     auto uiDelegate = static_cast<id<WKUIDelegatePrivate>>(_webView.UIDelegate);
-    if (!uiDelegate)
-        return completion(nil);
 
     if (needsDeprecatedPreviewAPI(uiDelegate)) {
-
         if (_positionInformation.isLink) {
             ALLOW_DEPRECATED_DECLARATIONS_BEGIN
@@ -7826 +7823 @@
                 auto previewElementInfo = adoptNS([[WKPreviewElementInfo alloc] _initWithLinkURL:linkURL]);
                 if (![uiDelegate webView:_webView shouldPreviewElement:previewElementInfo.get()])
-                    return completion(nil);
+                    return continueWithContextMenuConfiguration(nil);
             }
             ALLOW_DEPRECATED_DECLARATIONS_END
@@ -7835 +7832 @@
 #if ENABLE(DATA_DETECTION)
                 if (!WebCore::DataDetection::canBePresentedByDataDetectors(linkURL))
-                    return completion(nil);
+                    return continueWithContextMenuConfiguration(nil);
 #endif
             }
@@ -7866 +7863 @@
 
         // FIXME: Should we provide an identifier and ASSERT in delegates if we don't match?
-        return completion([UIContextMenuConfiguration configurationWithIdentifier:nil previewProvider:contentPreviewProvider actionProvider:actionMenuProvider]);
-    }
-
-    auto completionBlock = makeBlockPtr([completion = makeBlockPtr(completion), linkURL = WTFMove(linkURL), weakSelf = WeakObjCPtr<WKContentView>(self)] (UIContextMenuConfiguration *configurationFromWKUIDelegate) mutable {
+        return continueWithContextMenuConfiguration([UIContextMenuConfiguration configurationWithIdentifier:nil previewProvider:contentPreviewProvider actionProvider:actionMenuProvider]);
+    }
+
+    auto completionBlock = makeBlockPtr([continueWithContextMenuConfiguration = makeBlockPtr(continueWithContextMenuConfiguration), linkURL = WTFMove(linkURL), weakSelf = WeakObjCPtr<WKContentView>(self)] (UIContextMenuConfiguration *configurationFromWKUIDelegate) mutable {
 
         auto strongSelf = weakSelf.get();
         if (!strongSelf)
-            return completion(nil);
+            return continueWithContextMenuConfiguration(nil);
 
         if (configurationFromWKUIDelegate) {
             strongSelf->_contextMenuActionProviderDelegateNeedsOverride = YES;
-            completion(configurationFromWKUIDelegate);
+            continueWithContextMenuConfiguration(configurationFromWKUIDelegate);
             return;
         }
@@ -7890 +7887 @@
         // <rdar://problem/50572283>
         if (!linkURL.protocolIsInHTTPFamily() && !WebCore::DataDetection::canBePresentedByDataDetectors(linkURL))
-            return completion(nil);
+            return continueWithContextMenuConfiguration(nil);
 
         BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -7899 +7896 @@
             strongSelf->_contextMenuActionProviderDelegateNeedsOverride = YES;
             if (strongSelf->_showLinkPreviews)
-                return completion(configurationFromDD);
-            return completion([UIContextMenuConfiguration configurationWithIdentifier:[configurationFromDD identifier] previewProvider:nil actionProvider:[configurationFromDD actionProvider]]);
+                return continueWithContextMenuConfiguration(configurationFromDD);
+            return continueWithContextMenuConfiguration([UIContextMenuConfiguration configurationWithIdentifier:[configurationFromDD identifier] previewProvider:nil actionProvider:[configurationFromDD actionProvider]]);
         }
         END_BLOCK_OBJC_EXCEPTIONS;
 #endif
-        return completion(nil);
+        return continueWithContextMenuConfiguration(nil);
     });