Title: [187325] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187325
- Author
- [email protected]
- Date
- 2015-07-24 00:54:45 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187255. rdar://problem/21875510
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187324 => 187325)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:42 UTC (rev 187324)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:45 UTC (rev 187325)
@@ -1,5 +1,22 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187255. rdar://problem/21875510
+
+ 2015-07-23 Yongjun Zhang <[email protected]>
+
+ 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 <[email protected]>
+
Merge r187250. rdar://problem/21968460
2015-07-23 Beth Dakin <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187324 => 187325)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-24 07:54:42 UTC (rev 187324)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-24 07:54:45 UTC (rev 187325)
@@ -3388,6 +3388,11 @@
return rectArray.autorelease();
}
+- (void)_previewItemControllerDidCancelPreview:(UIPreviewItemController *)controller
+{
+ _highlightLongPressCanClick = NO;
+}
+
@end
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
