Changeset 248371 in webkit

Timestamp:

Aug 7, 2019, 10:19:08 AM (7 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r248330.

Breaks internal builds.

Reverted changeset:

"Context menu on a universal link produces a blank preview"
​https://bugs.webkit.org/show_bug.cgi?id=200485
​https://trac.webkit.org/changeset/248330

Location:

trunk/Source

Files:

• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (6 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2019-08-07  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r248330.
+
+        Breaks internal builds.
+
+        Reverted changeset:
+
+        "Context menu on a universal link produces a blank preview"
+        https://bugs.webkit.org/show_bug.cgi?id=200485
+        https://trac.webkit.org/changeset/248330
+
 2019-08-07  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h

@@ -33 +33 @@
 #import <CoreServices/CoreServicesPriv.h>
 #elif PLATFORM(IOS_FAMILY)
-#import <CoreServices/LSURLOverridePriv.h>
 #import <MobileCoreServices/LSAppLinkPriv.h>
 #endif
 
-#endif // USE(APPLE_INTERNAL_SDK)
+#endif
 
 #if HAVE(APP_LINKS)
@@ -75 +74 @@
 #endif
 
-@interface NSURL ()
-- (NSURL *)iTunesStoreURL;
-@end
-
 #if PLATFORM(MAC)
 enum LSSessionID {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-07  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r248330.
+
+        Breaks internal builds.
+
+        Reverted changeset:
+
+        "Context menu on a universal link produces a blank preview"
+        https://bugs.webkit.org/show_bug.cgi?id=200485
+        https://trac.webkit.org/changeset/248330
+
 2019-08-06  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -107 +107 @@
 #import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <pal/spi/cocoa/DataDetectorsCoreSPI.h>
-#import <pal/spi/cocoa/LaunchServicesSPI.h>
 #import <pal/spi/ios/DataDetectorsUISPI.h>
 #import <pal/spi/ios/GraphicsServicesSPI.h>
@@ -7810 +7809 @@
         // Previously, UIPreviewItemController would detect the case where there was no previewViewController
         // and create one. We need to replicate this code for the new API.
-        if (!previewViewController || [(NSURL *)url iTunesStoreURL]) {
+        if (!previewViewController) {
             auto ddContextMenuActionClass = getDDContextMenuActionClass();
             if ([ddContextMenuActionClass respondsToSelector:@selector(contextMenuConfigurationForURL:identifier:selectedText:results:inView:context:menuIdentifier:)]) {
@@ -7955 +7954 @@
         _page->startInteractionWithElementAtPosition(_positionInformation.request.point);
 
-        continueWithContextMenuConfiguration([UIContextMenuConfiguration configurationWithIdentifier:nil previewProvider:contentPreviewProvider actionProvider:actionMenuProvider]);
-        return;
-    }
-
-#if ENABLE(DATA_DETECTION)
-    if ([(NSURL *)linkURL iTunesStoreURL]) {
-        if ([self continueContextMenuInteractionWithDataDetectors:continueWithContextMenuConfiguration])
-            return;
-    }
-#endif
+        // FIXME: Should we provide an identifier and ASSERT in delegates if we don't match?
+        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) {
-            continueWithContextMenuConfiguration(nil);
-            return;
-        }
+        if (!strongSelf)
+            return continueWithContextMenuConfiguration(nil);
 
         if (configurationFromWKUIDelegate) {
@@ -8007 +7997 @@
             };
 
-            continueWithContextMenuConfiguration([UIContextMenuConfiguration configurationWithIdentifier:nil previewProvider:contentPreviewProvider actionProvider:actionMenuProvider]);
-            return;
+            return continueWithContextMenuConfiguration([UIContextMenuConfiguration configurationWithIdentifier:nil previewProvider:contentPreviewProvider actionProvider:actionMenuProvider]);
         }
 
@@ -8019 +8008 @@
         // FIXME: Support JavaScript urls here. But make sure they don't show a preview.
         // <rdar://problem/50572283>
-        if (!linkURL.protocolIsInHTTPFamily() && !WebCore::DataDetection::canBePresentedByDataDetectors(linkURL)) {
-            continueWithContextMenuConfiguration(nil);
-            return;
+        if (!linkURL.protocolIsInHTTPFamily() && !WebCore::DataDetection::canBePresentedByDataDetectors(linkURL))
+            return continueWithContextMenuConfiguration(nil);
+
+        BEGIN_BLOCK_OBJC_EXCEPTIONS;
+        auto ddContextMenuActionClass = getDDContextMenuActionClass();
+        if ([ddContextMenuActionClass respondsToSelector:@selector(contextMenuConfigurationWithURL:inView:context:menuIdentifier:)]) {
+            NSDictionary *context = [strongSelf dataDetectionContextForPositionInformation:strongSelf->_positionInformation];
+            UIContextMenuConfiguration *configurationFromDD = [ddContextMenuActionClass contextMenuConfigurationForURL:linkURL identifier:strongSelf->_positionInformation.dataDetectorIdentifier selectedText:[strongSelf selectedText] results:strongSelf->_positionInformation.dataDetectorResults.get() inView:strongSelf.get() context:context menuIdentifier:nil];
+            strongSelf->_contextMenuActionProviderDelegateNeedsOverride = YES;
+            strongSelf->_page->startInteractionWithElementAtPosition(strongSelf->_positionInformation.request.point);
+            if (strongSelf->_showLinkPreviews)
+                return continueWithContextMenuConfiguration(configurationFromDD);
+            return continueWithContextMenuConfiguration([UIContextMenuConfiguration configurationWithIdentifier:[configurationFromDD identifier] previewProvider:nil actionProvider:[configurationFromDD actionProvider]]);
         }
-
-        if ([strongSelf continueContextMenuInteractionWithDataDetectors:continueWithContextMenuConfiguration.get()])
-            return;
-#endif
-        continueWithContextMenuConfiguration(nil);
+        END_BLOCK_OBJC_EXCEPTIONS;
+#endif
+        return continueWithContextMenuConfiguration(nil);
     });
 
@@ -8051 +8048 @@
         completionBlock(nil);
 }
-
-#if ENABLE(DATA_DETECTION)
-- (BOOL)continueContextMenuInteractionWithDataDetectors:(void(^)(UIContextMenuConfiguration *))continueWithContextMenuConfiguration
-{
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    auto ddContextMenuActionClass = getDDContextMenuActionClass();
-    if ([ddContextMenuActionClass respondsToSelector:@selector(contextMenuConfigurationWithURL:inView:context:menuIdentifier:)]) {
-        URL linkURL = _positionInformation.url;
-        NSDictionary *context = [self dataDetectionContextForPositionInformation:_positionInformation];
-        UIContextMenuConfiguration *configurationFromDD = [ddContextMenuActionClass contextMenuConfigurationForURL:linkURL identifier:_positionInformation.dataDetectorIdentifier selectedText:[self selectedText] results:_positionInformation.dataDetectorResults.get() inView:self context:context menuIdentifier:nil];
-        _contextMenuActionProviderDelegateNeedsOverride = YES;
-        _page->startInteractionWithElementAtPosition(_positionInformation.request.point);
-        continueWithContextMenuConfiguration(configurationFromDD);
-        return YES;
-    }
-    END_BLOCK_OBJC_EXCEPTIONS;
-
-    return NO;
-}
-#endif
 
 - (NSArray<UIMenuElement *> *)_contextMenuInteraction:(UIContextMenuInteraction *)interaction overrideSuggestedActionsForConfiguration:(UIContextMenuConfiguration *)configuration