Title: [187608] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187608
- Author
- matthew_han...@apple.com
- Date
- 2015-07-30 14:20:40 -0700 (Thu, 30 Jul 2015)
Log Message
Merge r187565. rdar://problem/22061043
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187607 => 187608)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-30 21:20:38 UTC (rev 187607)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-30 21:20:40 UTC (rev 187608)
@@ -1,5 +1,23 @@
2015-07-30 Matthew Hanson <matthew_han...@apple.com>
+ Merge r187565. rdar://problem/22061043
+
+ 2015-07-29 Enrica Casucci <enr...@apple.com>
+
+ Preview should not start if touch handler prevents default.
+ https://bugs.webkit.org/show_bug.cgi?id=147423
+ rdar://problem/22061043
+
+ Reviewed by Tim Horton.
+
+ We need to check if _highlightLongPressCanClick has not been reset before
+ we allow the preview. It can be reset by a touch handler preventing default.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
+
+2015-07-30 Matthew Hanson <matthew_han...@apple.com>
+
Merge r187517. rdar://problem/21645007
2015-07-28 Yongjun Zhang <yongjun_zh...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187607 => 187608)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-30 21:20:38 UTC (rev 187607)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-30 21:20:40 UTC (rev 187608)
@@ -3209,6 +3209,9 @@
- (BOOL)_interactionShouldBeginFromPreviewItemController:(UIPreviewItemController *)controller forPosition:(CGPoint)position
{
+ if (!_highlightLongPressCanClick)
+ return NO;
+
[self ensurePositionInformationIsUpToDate:position];
if (_positionInformation.clickableElementName != "A" && _positionInformation.clickableElementName != "IMG")
return NO;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
