<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[246626] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/246626">246626</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2019-06-19 19:17:53 -0700 (Wed, 19 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>No menu pop-up when long pressing on a link in Firefox app
https://bugs.webkit.org/show_bug.cgi?id=199045
<rdar://problem/51422407>

Reviewed by Tim Horton.

Add a version check for linking on-or-after iOS 13. When
that isn't true, we don't use UIContextMenuInteraction
and instead fall back on the legacy UIPreviewItem API.

* UIProcess/Cocoa/VersionChecks.h: Add FirstThatHasUIContextMenuInteraction.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _shouldUseContextMenus]): New method to decide if we should
use context menus or preview items.
(-[WKContentView setupInteraction]): Make the decision at runtime rather than
compile time.
(-[WKContentView _contentsOfUserInterfaceItem:]): Ditto.
(-[WKContentView _registerPreview]): Ditto.
(-[WKContentView _unregisterPreview]): Ditto.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfspidarwindyldSPIh">trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaVersionChecksh">trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFwtfspidarwindyldSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h (246625 => 246626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h        2019-06-20 02:05:28 UTC (rev 246625)
+++ trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h   2019-06-20 02:17:53 UTC (rev 246626)
</span><span class="lines">@@ -41,6 +41,10 @@
</span><span class="cx"> #define DYLD_IOS_VERSION_12_0 0x000C0000
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#ifndef DYLD_IOS_VERSION_13_0
+#define DYLD_IOS_VERSION_13_0 0x000D0000
+#endif
+
</ins><span class="cx"> #ifndef DYLD_MACOSX_VERSION_10_13
</span><span class="cx"> #define DYLD_MACOSX_VERSION_10_13 0x000A0D00
</span><span class="cx"> #endif
</span><span class="lines">@@ -61,6 +65,7 @@
</span><span class="cx"> #define DYLD_IOS_VERSION_11_0 0x000B0000
</span><span class="cx"> #define DYLD_IOS_VERSION_11_3 0x000B0300
</span><span class="cx"> #define DYLD_IOS_VERSION_12_0 0x000C0000
</span><ins>+#define DYLD_IOS_VERSION_13_0 0x000D0000
</ins><span class="cx"> 
</span><span class="cx"> #define DYLD_MACOSX_VERSION_10_11 0x000A0B00
</span><span class="cx"> #define DYLD_MACOSX_VERSION_10_12 0x000A0C00
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (246625 => 246626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-06-20 02:05:28 UTC (rev 246625)
+++ trunk/Source/WebKit/ChangeLog       2019-06-20 02:17:53 UTC (rev 246626)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2019-06-19  Dean Jackson  <dino@apple.com>
+
+        No menu pop-up when long pressing on a link in Firefox app
+        https://bugs.webkit.org/show_bug.cgi?id=199045
+        <rdar://problem/51422407>
+
+        Reviewed by Tim Horton.
+
+        Add a version check for linking on-or-after iOS 13. When
+        that isn't true, we don't use UIContextMenuInteraction
+        and instead fall back on the legacy UIPreviewItem API.
+
+        * UIProcess/Cocoa/VersionChecks.h: Add FirstThatHasUIContextMenuInteraction.
+        * UIProcess/ios/WKContentViewInteraction.h: 
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _shouldUseContextMenus]): New method to decide if we should
+        use context menus or preview items.
+        (-[WKContentView setupInteraction]): Make the decision at runtime rather than
+        compile time.
+        (-[WKContentView _contentsOfUserInterfaceItem:]): Ditto.
+        (-[WKContentView _registerPreview]): Ditto.
+        (-[WKContentView _unregisterPreview]): Ditto.
+
</ins><span class="cx"> 2019-06-19  Andy Estes  <aestes@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] Fall back to taking a UIView snapshohot for UITargetedPreviews if InteractionInformationAtPosition does not have an image
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaVersionChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h (246625 => 246626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h      2019-06-20 02:05:28 UTC (rev 246625)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h 2019-06-20 02:17:53 UTC (rev 246626)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx">     FirstThatDecidesPolicyBeforeLoadingQuickLookPreview = DYLD_IOS_VERSION_FIRST_THAT_DECIDES_POLICY_BEFORE_LOADING_QUICK_LOOK_PREVIEW,
</span><span class="cx">     FirstWithExceptionsForRelatedWebViewsUsingDifferentDataStores = DYLD_IOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES,
</span><span class="cx">     FirstWithModernCompabilityModeByDefault = DYLD_IOS_VERSION_FIRST_WITH_MODERN_COMPATIBILITY_MODE_BY_DEFAULT,
</span><ins>+    FirstThatHasUIContextMenuInteraction = DYLD_IOS_VERSION_13_0,
</ins><span class="cx"> #elif PLATFORM(MAC)
</span><span class="cx">     FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11,
</span><span class="cx">     FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_MACOSX_VERSION_10_13,
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (246625 => 246626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h     2019-06-20 02:05:28 UTC (rev 246625)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h        2019-06-20 02:17:53 UTC (rev 246626)
</span><span class="lines">@@ -251,10 +251,9 @@
</span><span class="cx">     RetainPtr<UIMenu> _contextMenuLegacyMenu;
</span><span class="cx">     BOOL _contextMenuHasRequestedLegacyData;
</span><span class="cx">     RetainPtr<UITargetedPreview> _contextMenuInteractionTargetedPreview;
</span><del>-#else
</del><ins>+#endif
</ins><span class="cx">     RetainPtr<UIPreviewItemController> _previewItemController;
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     std::unique_ptr<WebKit::SmartMagnificationController> _smartMagnificationController;
</span><span class="cx"> 
</span><span class="lines">@@ -537,10 +536,11 @@
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(LINK_PREVIEW)
</span><span class="cx"> #if USE(UICONTEXTMENU)
</span><del>-@interface WKContentView (WKInteractionPreview) <UIContextMenuInteractionDelegate>
</del><ins>+@interface WKContentView (WKInteractionPreview) <UIContextMenuInteractionDelegate, UIPreviewItemDelegate>
</ins><span class="cx"> #else
</span><span class="cx"> @interface WKContentView (WKInteractionPreview) <UIPreviewItemDelegate>
</span><span class="cx"> #endif
</span><ins>+- (bool)_shouldUseContextMenus;
</ins><span class="cx"> - (void)_registerPreview;
</span><span class="cx"> - (void)_unregisterPreview;
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (246625 => 246626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2019-06-20 02:05:28 UTC (rev 246625)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2019-06-20 02:17:53 UTC (rev 246626)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #import "SmartMagnificationController.h"
</span><span class="cx"> #import "TextInputSPI.h"
</span><span class="cx"> #import "UIKitSPI.h"
</span><ins>+#import "VersionChecks.h"
</ins><span class="cx"> #import "WKActionSheetAssistant.h"
</span><span class="cx"> #import "WKContextMenuElementInfoInternal.h"
</span><span class="cx"> #import "WKDatePickerViewController.h"
</span><span class="lines">@@ -768,9 +769,11 @@
</span><span class="cx">     [_highlightLongPressGestureRecognizer setDelay:highlightDelay];
</span><span class="cx">     [_highlightLongPressGestureRecognizer setDelegate:self];
</span><span class="cx"> 
</span><del>-#if HAVE(LINK_PREVIEW) && !USE(UICONTEXTMENU)
-    [self addGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
-    [self _createAndConfigureLongPressGestureRecognizer];
</del><ins>+#if HAVE(LINK_PREVIEW)
+    if (![self _shouldUseContextMenus]) {
+        [self addGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
+        [self _createAndConfigureLongPressGestureRecognizer];
+    }
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(DATA_INTERACTION)
</span><span class="lines">@@ -7367,12 +7370,11 @@
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(LINK_PREVIEW)
</span><span class="cx">     if ([userInterfaceItem isEqualToString:@"linkPreviewPopoverContents"]) {
</span><del>-#if USE(UICONTEXTMENU)
-        return @{ userInterfaceItem: @{ @"pageURL": WTF::userVisibleString(_positionInformation.url) } };
-#else
</del><ins>+        if ([self _shouldUseContextMenus])
+            return @{ userInterfaceItem: @{ @"pageURL": WTF::userVisibleString(_positionInformation.url) } };
+
</ins><span class="cx">         NSString *url = [_previewItemController previewData][UIPreviewDataLink];
</span><span class="cx">         return @{ userInterfaceItem: @{ @"pageURL": url } };
</span><del>-#endif
</del><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -7411,35 +7413,68 @@
</span><span class="cx">     return nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+@implementation WKContentView (WKInteractionPreview)
+
+- (bool)_shouldUseContextMenus
+{
</ins><span class="cx"> #if USE(UICONTEXTMENU)
</span><ins>+    return linkedOnOrAfter(WebKit::SDKVersion::FirstThatHasUIContextMenuInteraction);
+#endif
+    return false;
+}
</ins><span class="cx"> 
</span><del>-@implementation WKContentView (WKInteractionPreview)
-
</del><span class="cx"> - (void)_registerPreview
</span><span class="cx"> {
</span><span class="cx">     if (!_webView.allowsLinkPreview)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    _contextMenuInteraction = adoptNS([[UIContextMenuInteraction alloc] initWithDelegate:self]);
-    _contextMenuHasRequestedLegacyData = NO;
-    [self addInteraction:_contextMenuInteraction.get()];
</del><ins>+#if USE(UICONTEXTMENU)
+    if ([self _shouldUseContextMenus]) {
+        _contextMenuInteraction = adoptNS([[UIContextMenuInteraction alloc] initWithDelegate:self]);
+        _contextMenuHasRequestedLegacyData = NO;
+        [self addInteraction:_contextMenuInteraction.get()];
</ins><span class="cx"> 
</span><del>-    [self _showLinkPreviewsPreferenceChanged:nil];
</del><ins>+        [self _showLinkPreviewsPreferenceChanged:nil];
</ins><span class="cx"> 
</span><del>-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_showLinkPreviewsPreferenceChanged:) name:webkitShowLinkPreviewsPreferenceChangedNotification object:nil];
</del><ins>+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_showLinkPreviewsPreferenceChanged:) name:webkitShowLinkPreviewsPreferenceChangedNotification object:nil];
+
+        return;
+    }
+#endif
+
+    if (!_webView.allowsLinkPreview)
+        return;
+
+    _previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
+    [_previewItemController setDelegate:self];
+    _previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
+    if ([_previewItemController respondsToSelector:@selector(presentationSecondaryGestureRecognizer)])
+        _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_unregisterPreview
</span><span class="cx"> {
</span><del>-    if (!_contextMenuInteraction)
</del><ins>+#if USE(UICONTEXTMENU)
+    if ([self _shouldUseContextMenus]) {
+        if (!_contextMenuInteraction)
+            return;
+
+        [self removeInteraction:_contextMenuInteraction.get()];
+        _contextMenuInteraction = nil;
+
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:webkitShowLinkPreviewsPreferenceChangedNotification object:nil];
</ins><span class="cx">         return;
</span><ins>+    }
+#endif
</ins><span class="cx"> 
</span><del>-    [self removeInteraction:_contextMenuInteraction.get()];
-    _contextMenuInteraction = nil;
-
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:webkitShowLinkPreviewsPreferenceChangedNotification object:nil];
</del><ins>+    [_previewItemController setDelegate:nil];
+    _previewGestureRecognizer = nil;
+    _previewSecondaryGestureRecognizer = nil;
+    _previewItemController = nil;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if USE(UICONTEXTMENU)
+
</ins><span class="cx"> - (void)_showLinkPreviewsPreferenceChanged:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx">     Boolean keyExistsAndHasValidFormat = false;
</span><span class="lines">@@ -8004,32 +8039,8 @@
</span><span class="cx">     _contextMenuInteractionTargetedPreview = nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-@end
</del><ins>+#endif // USE(UICONTEXTMENU)
</ins><span class="cx"> 
</span><del>-#else
-
-@implementation WKContentView (WKInteractionPreview)
-
-- (void)_registerPreview
-{
-    if (!_webView.allowsLinkPreview)
-        return;
-
-    _previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
-    [_previewItemController setDelegate:self];
-    _previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
-    if ([_previewItemController respondsToSelector:@selector(presentationSecondaryGestureRecognizer)])
-        _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
-}
-
-- (void)_unregisterPreview
-{
-    [_previewItemController setDelegate:nil];
-    _previewGestureRecognizer = nil;
-    _previewSecondaryGestureRecognizer = nil;
-    _previewItemController = nil;
-}
-
</del><span class="cx"> - (BOOL)_interactionShouldBeginFromPreviewItemController:(UIPreviewItemController *)controller forPosition:(CGPoint)position
</span><span class="cx"> {
</span><span class="cx">     if (!_longPressCanClick)
</span><span class="lines">@@ -8354,8 +8365,6 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-#endif // USE(UICONTEXTMENU)
-
</del><span class="cx"> #endif // HAVE(LINK_PREVIEW)
</span><span class="cx"> 
</span><span class="cx"> // UITextRange, UITextPosition and UITextSelectionRect implementations for WK2
</span></span></pre>
</div>
</div>

</body>
</html>