Changeset 249368 in webkit

Timestamp:

Sep 1, 2019 1:42:36 PM (5 years ago)

Author:

Wenson Hsieh

Message:

Long presses that interrupt accelerated scrolling dispatch clicks on apps linked against iOS 12 or earlier
​https://bugs.webkit.org/show_bug.cgi?id=201346
<rdar://problem/54885784>

Reviewed by Dean Jackson.

Source/WebKit:

For apps that are linked on or after iOS 13, we add a context menu interaction to the content view, which
requires us to disable (or avoid adding) the highlight long press gesture recognizer. However, for apps that are
linked on the iOS 12 SDK or prior, this gesture is still present, and fires when long pressing for (roughly) up
to 0.75 seconds if a tap gesture was not recognized instead. Firing this gesture sends a click event to the
page; this brings back some form of <rdar://problem/53889373>, but only when holding for slightly longer than a
normal tap, and also only in apps linked on iOS 12 or earlier. To fix this, we apply a similar solution as in
r248433 and detect whether a long press gesture interrupted scroll view deceleration in
-gestureRecognizerShouldBegin:. If so, we return NO to avoid clicking. See per-method comments below for more
details.

Testing this bug as-is was tricky, since there's no way in layout tests to simulate being linked on or before a
given SDK version. Luckily, recall that:

1. This bug occurs when the highlight gesture recognizer is enabled and added to the content view.
2. The highlight gesture recognizer only needs to be disabled or removed when context menu interaction is added.

As such, we should be able to restore the highlight gesture recognizer by suppressing the context menu
interaction in an app linked-on-or-after iOS 13, by setting allowsLinkPreview to NO. Unfortunately, this doesn't
quite work, since we currently always avoid adding the highlight gesture recognizer if the app is linked on
iOS 13 or later.

However, this means that the highlight gesture recognizer is absent from the content view in apps linked against
iOS 13 that disable link previews, even though its absence is not required. This means that long pressing a
clickable element in a web view that disables link previews does not show a tap highlight on iOS 13, whereas it
would on iOS 12; this is a regression, albeit a very subtle one. To fix this subtle issue and make it possible
to write a test for this bug, we refactor some logic for creating and configuring the highlight long press
gesture, such that we now unconditionally add the highlight gesture, but only enable it in apps linked on or
after iOS 13 if link previews (i.e. context menu interaction) are not allowed.

Test: fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-overflow.html

• SourcesCocoa.txt:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView setAllowsLinkPreview:]):

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView setupInteraction]):

Refactor our gesture setup logic to always create and add the long press and highlight long press gestures, but
conditionally disable them based on whether or not (1) the context menu is available, and (2) WKWebView's
allowsLinkPreview property.

(-[WKContentView _didChangeLinkPreviewAvailability]):
(-[WKContentView _updateLongPressAndHighlightLongPressGestures]):

Add a new helper to update the enabled state of the long press and highlight long press gestures, by consulting
-_shouldUseContextMenu and -allowsLinkPreview. This is called when setting up the gestures, as well as whenever
-allowsLinkPreview changes.

(-[WKContentView gestureRecognizerShouldBegin:]):

Factor out logic to ascend the view hierarchy in search of a UIScrollView that was interrupted while
decelerating into a local lambda function; use this for both the highlight gesture and the single tap gesture,
to determine whether they should begin.

• UIProcess/ios/WKHighlightLongPressGestureRecognizer.h: Added.
• UIProcess/ios/WKHighlightLongPressGestureRecognizer.mm: Added.

In order to remember the UIScrollView (if any) tracked by the highlight long press gesture, we subclass
_UIWebHighlightLongPressGestureRecognizer. While UILongPressGestureRecognizer does have SPI to ask for a list of
UITouches, by the time the gesture has been recognized and the gesture delegates are invoked, these UITouches
no longer correspond to UIViews. As such, the only time we have access to the list of UITouches with their
UIViews is during the touches* subclass hooks.

(-[WKHighlightLongPressGestureRecognizer reset]):

Clear out the tracked UIScrollView here, when the gesture is reset (i.e. after ending, or being canceled).

(-[WKHighlightLongPressGestureRecognizer touchesBegan:withEvent:]):

Remember the last touched UIScrollView here.

(-[WKHighlightLongPressGestureRecognizer lastTouchedScrollView]):

• WebKit.xcodeproj/project.pbxproj:

Tools:

Add a new test option to allow tests to disable link previews.

• WebKitTestRunner/TestController.cpp:

(WTR::updateTestOptionsFromTestHeader):

• WebKitTestRunner/TestOptions.h:

Drive-by fix: also check enableLazyImageLoading when determining whether two TestOptions are the same.

(WTR::TestOptions::hasSameInitializationOptions const):

• WebKitTestRunner/cocoa/TestControllerCocoa.mm:

(WTR::TestController::platformCreateWebView):

LayoutTests:

Add a couple of new layout tests to verify that using a long press gesture to interrupt momentum scrolling in a
web view that uses API to disable link previews does not result in a click.

• fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-main-frame-expected.txt: Added.
• fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-main-frame.html: Added.
• fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-overflow-expected.txt: Added.
• fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-overflow.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-main-frame-expected.txt (added)
• LayoutTests/fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-main-frame.html (added)
• LayoutTests/fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-overflow-expected.txt (added)
• LayoutTests/fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-overflow.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/SourcesCocoa.txt (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (modified) (4 diffs)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (6 diffs)
• Source/WebKit/UIProcess/ios/WKHighlightLongPressGestureRecognizer.h (added)
• Source/WebKit/UIProcess/ios/WKHighlightLongPressGestureRecognizer.mm (added)
• Source/WebKit/WebKit.xcodeproj/project.pbxproj (modified) (6 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/TestOptions.h (modified) (2 diffs)
• Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-09-01  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Long presses that interrupt accelerated scrolling dispatch clicks on apps linked against iOS 12 or earlier
+        https://bugs.webkit.org/show_bug.cgi?id=201346
+        <rdar://problem/54885784>
+
+        Reviewed by Dean Jackson.
+
+        Add a couple of new layout tests to verify that using a long press gesture to interrupt momentum scrolling in a
+        web view that uses API to disable link previews does not result in a click.
+
+        * fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-main-frame-expected.txt: Added.
+        * fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-main-frame.html: Added.
+        * fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-overflow-expected.txt: Added.
+        * fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-overflow.html: Added.
+
 2019-09-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-01  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Long presses that interrupt accelerated scrolling dispatch clicks on apps linked against iOS 12 or earlier
+        https://bugs.webkit.org/show_bug.cgi?id=201346
+        <rdar://problem/54885784>
+
+        Reviewed by Dean Jackson.
+
+        For apps that are linked on or after iOS 13, we add a context menu interaction to the content view, which
+        requires us to disable (or avoid adding) the highlight long press gesture recognizer. However, for apps that are
+        linked on the iOS 12 SDK or prior, this gesture is still present, and fires when long pressing for (roughly) up
+        to 0.75 seconds if a tap gesture was not recognized instead. Firing this gesture sends a click event to the
+        page; this brings back some form of <rdar://problem/53889373>, but only when holding for slightly longer than a
+        normal tap, and also only in apps linked on iOS 12 or earlier. To fix this, we apply a similar solution as in
+        r248433 and detect whether a long press gesture interrupted scroll view deceleration in
+        -gestureRecognizerShouldBegin:. If so, we return NO to avoid clicking. See per-method comments below for more
+        details.
+
+        Testing this bug as-is was tricky, since there's no way in layout tests to simulate being linked on or before a
+        given SDK version. Luckily, recall that:
+        1. This bug occurs when the highlight gesture recognizer is enabled and added to the content view.
+        2. The highlight gesture recognizer only needs to be disabled or removed when context menu interaction is added.
+        As such, we should be able to restore the highlight gesture recognizer by suppressing the context menu
+        interaction in an app linked-on-or-after iOS 13, by setting allowsLinkPreview to NO. Unfortunately, this doesn't
+        quite work, since we currently always avoid adding the highlight gesture recognizer if the app is linked on
+        iOS 13 or later.
+
+        However, this means that the highlight gesture recognizer is absent from the content view in apps linked against
+        iOS 13 that disable link previews, even though its absence is not required. This means that long pressing a
+        clickable element in a web view that disables link previews does not show a tap highlight on iOS 13, whereas it
+        would on iOS 12; this is a regression, albeit a very subtle one. To fix this subtle issue and make it possible
+        to write a test for this bug, we refactor some logic for creating and configuring the highlight long press
+        gesture, such that we now unconditionally add the highlight gesture, but only enable it in apps linked on or
+        after iOS 13 if link previews (i.e. context menu interaction) are not allowed.
+
+        Test: fast/scrolling/ios/click-events-after-long-press-during-momentum-scroll-in-overflow.html
+
+        * SourcesCocoa.txt:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView setAllowsLinkPreview:]):
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]):
+
+        Refactor our gesture setup logic to always create and add the long press and highlight long press gestures, but
+        conditionally disable them based on whether or not (1) the context menu is available, and (2) WKWebView's
+        allowsLinkPreview property.
+
+        (-[WKContentView _didChangeLinkPreviewAvailability]):
+        (-[WKContentView _updateLongPressAndHighlightLongPressGestures]):
+
+        Add a new helper to update the enabled state of the long press and highlight long press gestures, by consulting
+        -_shouldUseContextMenu and -allowsLinkPreview. This is called when setting up the gestures, as well as whenever
+        -allowsLinkPreview changes.
+
+        (-[WKContentView gestureRecognizerShouldBegin:]):
+
+        Factor out logic to ascend the view hierarchy in search of a UIScrollView that was interrupted while
+        decelerating into a local lambda function; use this for both the highlight gesture and the single tap gesture,
+        to determine whether they should begin.
+
+        * UIProcess/ios/WKHighlightLongPressGestureRecognizer.h: Added.
+        * UIProcess/ios/WKHighlightLongPressGestureRecognizer.mm: Added.
+
+        In order to remember the UIScrollView (if any) tracked by the highlight long press gesture, we subclass
+        _UIWebHighlightLongPressGestureRecognizer. While UILongPressGestureRecognizer does have SPI to ask for a list of
+        UITouches, by the time the gesture has been recognized and the gesture delegates are invoked, these UITouches
+        no longer correspond to UIViews. As such, the only time we have access to the list of UITouches with their
+        UIViews is during the touches* subclass hooks.
+
+        (-[WKHighlightLongPressGestureRecognizer reset]):
+
+        Clear out the tracked UIScrollView here, when the gesture is reset (i.e. after ending, or being canceled).
+
+        (-[WKHighlightLongPressGestureRecognizer touchesBegan:withEvent:]):
+
+        Remember the last touched UIScrollView here.
+
+        (-[WKHighlightLongPressGestureRecognizer lastTouchedScrollView]):
+        * WebKit.xcodeproj/project.pbxproj:
+
 2019-08-30  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/SourcesCocoa.txt

@@ -423 +423 @@
 UIProcess/ios/WKGeolocationProviderIOS.mm
 UIProcess/ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm
+UIProcess/ios/WKHighlightLongPressGestureRecognizer.mm
 UIProcess/ios/WKInspectorNodeSearchGestureRecognizer.mm
 UIProcess/ios/WKKeyboardScrollingAnimator.mm

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -1268 +1268 @@
     else
         [_contentView _unregisterPreview];
+    [_contentView _didChangeLinkPreviewAvailability];
 #endif // HAVE(LINK_PREVIEW)
 #endif // PLATFORM(IOS_FAMILY)

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

@@ -100 +100 @@
 @class _UILookupGestureRecognizer;
 @class _UIHighlightView;
-@class _UIWebHighlightLongPressGestureRecognizer;
 @class UIHoverGestureRecognizer;
 @class UITargetedPreview;
@@ -110 +109 @@
 @class WKFormInputControl;
 @class WKFormInputSession;
+@class WKHighlightLongPressGestureRecognizer;
 @class WKInspectorNodeSearchGestureRecognizer;
 
@@ -214 +214 @@
 
     RetainPtr<WKSyntheticTapGestureRecognizer> _singleTapGestureRecognizer;
-    RetainPtr<_UIWebHighlightLongPressGestureRecognizer> _highlightLongPressGestureRecognizer;
+    RetainPtr<WKHighlightLongPressGestureRecognizer> _highlightLongPressGestureRecognizer;
     RetainPtr<UILongPressGestureRecognizer> _longPressGestureRecognizer;
     RetainPtr<WKSyntheticTapGestureRecognizer> _doubleTapGestureRecognizer;
@@ -549 +549 @@
 @property (nonatomic, readonly) BOOL _shouldAvoidScrollingWhenFocusedContentIsVisible;
 
+- (void)_didChangeLinkPreviewAvailability;
+
 @end
 

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

@@ -53 +53 @@
 #import "WKFormInputControl.h"
 #import "WKFormSelectControl.h"
+#import "WKHighlightLongPressGestureRecognizer.h"
 #import "WKImagePreviewViewController.h"
 #import "WKInspectorNodeSearchGestureRecognizer.h"
@@ -756 +757 @@
     [self addGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
 
-    _highlightLongPressGestureRecognizer = adoptNS([[_UIWebHighlightLongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_highlightLongPressRecognized:)]);
+    _highlightLongPressGestureRecognizer = adoptNS([[WKHighlightLongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_highlightLongPressRecognized:)]);
     [_highlightLongPressGestureRecognizer setDelay:highlightDelay];
     [_highlightLongPressGestureRecognizer setDelegate:self];
+    [self addGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
+
+    [self _createAndConfigureLongPressGestureRecognizer];
 
 #if HAVE(LINK_PREVIEW)
-    if (!self._shouldUseContextMenus) {
-        [self addGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
-        [self _createAndConfigureLongPressGestureRecognizer];
-    }
+    [self _updateLongPressAndHighlightLongPressGestures];
 #endif
 
@@ -1005 +1006 @@
     [self addGestureRecognizer:_touchActionGestureRecognizer.get()];
 #endif
+}
+
+- (void)_didChangeLinkPreviewAvailability
+{
+    [self _updateLongPressAndHighlightLongPressGestures];
+}
+
+- (void)_updateLongPressAndHighlightLongPressGestures
+{
+    // We only disable the highlight long press gesture in the case where UIContextMenu is available and we
+    // also allow link previews, since the context menu interaction's gestures need to take precedence over
+    // highlight long press gestures.
+    [_highlightLongPressGestureRecognizer setEnabled:!self._shouldUseContextMenus || !_webView.allowsLinkPreview];
+
+    // We only enable the long press gesture in the case where the app is linked on iOS 12 or earlier (and
+    // therefore prefers the legacy action sheet over context menus), and link previews are also enabled.
+    [_longPressGestureRecognizer setEnabled:!self._shouldUseContextMenus && _webView.allowsLinkPreview];
 }
 
@@ -2092 +2110 @@
         return _webView._stylusTapGestureShouldCreateEditableImage;
 
-    if (gestureRecognizer == _singleTapGestureRecognizer) {
+    auto isInterruptingDecelerationForScrollViewOrAncestor = [&] (UIScrollView *scrollView) {
         UIScrollView *mainScroller = _webView.scrollView;
-        UIView *view = [_singleTapGestureRecognizer lastTouchedScrollView] ?: mainScroller;
+        UIView *view = scrollView ?: mainScroller;
         while (view) {
             if ([view isKindOfClass:UIScrollView.class] && [(UIScrollView *)view _isInterruptingDeceleration])
-                return NO;
+                return YES;
 
             if (mainScroller == view)
@@ -2104 +2122 @@
             view = view.superview;
         }
-        return YES;
-    }
+        return NO;
+    };
+
+    if (gestureRecognizer == _singleTapGestureRecognizer)
+        return !isInterruptingDecelerationForScrollViewOrAncestor([_singleTapGestureRecognizer lastTouchedScrollView]);
 
     if (gestureRecognizer == _highlightLongPressGestureRecognizer
@@ -2124 +2145 @@
 
     if (gestureRecognizer == _highlightLongPressGestureRecognizer) {
+        if (isInterruptingDecelerationForScrollViewOrAncestor([_highlightLongPressGestureRecognizer lastTouchedScrollView]))
+            return NO;
+
         if (hasFocusedElement(_focusedElementInformation)) {
             // This is a different element than the focused one.

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1708 +1708 @@
                 F4D5F51D206087A10038BBA8 /* WKTextInputListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = F4D5F519206087A00038BBA8 /* WKTextInputListViewController.h */; };
                 F4D5F51F206087A10038BBA8 /* WKQuickboardListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = F4D5F51B206087A10038BBA8 /* WKQuickboardListViewController.h */; };
+                F4DB54E62319E733009E3155 /* WKHighlightLongPressGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F4DB54E42319E733009E3155 /* WKHighlightLongPressGestureRecognizer.h */; };
                 F6113E25126CE1820057D0A7 /* APIUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */; };
                 F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -4765 +4766 @@
                 F4D5F51B206087A10038BBA8 /* WKQuickboardListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKQuickboardListViewController.h; path = ios/forms/WKQuickboardListViewController.h; sourceTree = "<group>"; };
                 F4D5F51C206087A10038BBA8 /* WKQuickboardListViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKQuickboardListViewController.mm; path = ios/forms/WKQuickboardListViewController.mm; sourceTree = "<group>"; };
+                F4DB54E42319E733009E3155 /* WKHighlightLongPressGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKHighlightLongPressGestureRecognizer.h; path = ios/WKHighlightLongPressGestureRecognizer.h; sourceTree = "<group>"; };
+                F4DB54E52319E733009E3155 /* WKHighlightLongPressGestureRecognizer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKHighlightLongPressGestureRecognizer.mm; path = ios/WKHighlightLongPressGestureRecognizer.mm; sourceTree = "<group>"; };
                 F4F59AD32065A5C9006CAA46 /* WKSelectMenuListViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKSelectMenuListViewController.mm; path = ios/forms/WKSelectMenuListViewController.mm; sourceTree = "<group>"; };
                 F4F59AD42065A5CA006CAA46 /* WKSelectMenuListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKSelectMenuListViewController.h; path = ios/forms/WKSelectMenuListViewController.h; sourceTree = "<group>"; };
@@ -6102 +6105 @@
                                 0FCB4E4018BBE044000FCFC9 /* WKGeolocationProviderIOS.mm */,
                                 0FCB4E4118BBE044000FCFC9 /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */,
+                                F4DB54E42319E733009E3155 /* WKHighlightLongPressGestureRecognizer.h */,
+                                F4DB54E52319E733009E3155 /* WKHighlightLongPressGestureRecognizer.mm */,
                                 933DF82D1B3BC09000AEA9E3 /* WKImagePreviewViewController.h */,
                                 933DF82F1B3BC0B400AEA9E3 /* WKImagePreviewViewController.mm */,
@@ -9939 +9944 @@
                                 C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */,
                                 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */,
+                                46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */,
                                 BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */,
                                 512127C41908239A00DAF35C /* WebPasteboardOverrides.h in Headers */,
@@ -10029 +10035 @@
                                 2D12DAB520662C73006F00FB /* WKAnimationDelegate.h in Headers */,
                                 BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */,
-                                46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */,
                                 512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */,
                                 A13DC682207AA6B20066EF72 /* WKApplicationStateTrackingView.h in Headers */,
@@ -10179 +10184 @@
                                 0FCB4E4F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h in Headers */,
                                 BCC8B374125FB69000DE46A4 /* WKGeometry.h in Headers */,
+                                F4DB54E62319E733009E3155 /* WKHighlightLongPressGestureRecognizer.h in Headers */,
                                 1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */,
                                 B62E7312143047B00069EC35 /* WKHitTestResult.h in Headers */,

trunk/Tools/ChangeLog

@@ +1 @@
+2019-09-01  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Long presses that interrupt accelerated scrolling dispatch clicks on apps linked against iOS 12 or earlier
+        https://bugs.webkit.org/show_bug.cgi?id=201346
+        <rdar://problem/54885784>
+
+        Reviewed by Dean Jackson.
+
+        Add a new test option to allow tests to disable link previews.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::updateTestOptionsFromTestHeader):
+        * WebKitTestRunner/TestOptions.h:
+
+        Drive-by fix: also check enableLazyImageLoading when determining whether two TestOptions are the same.
+
+        (WTR::TestOptions::hasSameInitializationOptions const):
+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+        (WTR::TestController::platformCreateWebView):
+
 2019-08-30  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -1403 +1403 @@
         else if (key == "enableLazyImageLoading")
             testOptions.enableLazyImageLoading = parseBooleanTestHeaderValue(value);
+        else if (key == "allowsLinkPreview")
+            testOptions.allowsLinkPreview = parseBooleanTestHeaderValue(value);
         pairStart = pairEnd + 1;
     }

trunk/Tools/WebKitTestRunner/TestOptions.h

@@ -96 +96 @@
     bool enablePageCache { false };
     bool enableLazyImageLoading { false };
+    bool allowsLinkPreview { true };
 
     double contentInsetTop { 0 };
@@ -152 +153 @@
             || contentMode != options.contentMode
             || enableAppNap != options.enableAppNap
-            || enablePageCache != options.enablePageCache)
+            || enablePageCache != options.enablePageCache
+            || enableLazyImageLoading != options.enableLazyImageLoading
+            || allowsLinkPreview != options.allowsLinkPreview)
             return false;
 

trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

@@ -178 +178 @@
     if (options.editable)
         m_mainWebView->setEditable(true);
+
+    m_mainWebView->platformView().allowsLinkPreview = options.allowsLinkPreview;
 }