Changeset 189944 in webkit

Timestamp:

Sep 17, 2015 4:30:19 PM (9 years ago)

Author:

Beth Dakin

Message:

Heavy taps on links are sometimes interpreted as the preview gesture
​https://bugs.webkit.org/show_bug.cgi?id=149304
-and corresponding-
rdar://problem/22689258

Reviewed by Tim Horton.

If the preview gesture starts and stop and less than 250 milliseconds have
passed, then call _attemptClickAtLocation to treat it as a normal tap.

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

(-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
(-[WKContentView _interactionStartedFromPreviewItemController:]):
(-[WKContentView _interactionStoppedFromPreviewItemController:]):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-09-17  Beth Dakin  <bdakin@apple.com>
+
+        Heavy taps on links are sometimes interpreted as the preview gesture
+        https://bugs.webkit.org/show_bug.cgi?id=149304
+        -and corresponding-
+        rdar://problem/22689258
+
+        Reviewed by Tim Horton.
+
+        If the preview gesture starts and stop and less than 250 milliseconds have 
+        passed, then call _attemptClickAtLocation to treat it as a normal tap.
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
+        (-[WKContentView _interactionStartedFromPreviewItemController:]):
+        (-[WKContentView _interactionStoppedFromPreviewItemController:]):
+
 2015-09-17  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -159 +159 @@
     BOOL _inspectorNodeSearchEnabled;
     BOOL _didAccessoryTabInitiateFocus;
+
+    std::chrono::steady_clock::time_point _lastPreviewStartTime;
 }
 

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

@@ -3239 +3239 @@
 - (BOOL)_interactionShouldBeginFromPreviewItemController:(UIPreviewItemController *)controller forPosition:(CGPoint)position
 {
+    _lastPreviewStartTime = std::chrono::steady_clock::now();
+
     if (!_highlightLongPressCanClick)
         return NO;
@@ -3384 +3386 @@
 - (void)_interactionStoppedFromPreviewItemController:(UIPreviewItemController *)controller
 {
+    std::chrono::milliseconds elapsedTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - _lastPreviewStartTime);
+    if (elapsedTime <= 250_ms)
+        [self _attemptClickAtLocation:_positionInformation.point];
+
     [self _addDefaultGestureRecognizers];