Changeset 187325 in webkit

Timestamp:

Jul 24, 2015, 12:54:45 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187255. rdar://problem/21875510

Location:

branches/safari-601.1-branch/Source/WebKit2

Files:

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

branches/safari-601.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187255. rdar://problem/21875510
+
+    2015-07-23  Yongjun Zhang  <yongjun_zhang@apple.com>
+
+            Adopt the new _previewItemControllerDidCancelPreview delegate method.
+            https://bugs.webkit.org/show_bug.cgi?id=147238
+
+            Don't allow hightlight long press to trigger tap if the link preview is cancelled because
+            the link is not preview-able.
+
+            Reviewed by Beth Dakin.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView _previewItemControllerDidCancelPreview:]):
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -3389 +3389 @@
 }
 
+- (void)_previewItemControllerDidCancelPreview:(UIPreviewItemController *)controller
+{
+    _highlightLongPressCanClick = NO;
+}
+
 @end