Title: [185689] tags/Safari-601.1.36.1/Source/WebKit2
- Revision
- 185689
- Author
- [email protected]
- Date
- 2015-06-17 18:55:35 -0700 (Wed, 17 Jun 2015)
Log Message
Merged r185684. rdar://problem/21388784
Modified Paths
Diff
Modified: tags/Safari-601.1.36.1/Source/WebKit2/ChangeLog (185688 => 185689)
--- tags/Safari-601.1.36.1/Source/WebKit2/ChangeLog 2015-06-18 01:53:43 UTC (rev 185688)
+++ tags/Safari-601.1.36.1/Source/WebKit2/ChangeLog 2015-06-18 01:55:35 UTC (rev 185689)
@@ -1,3 +1,20 @@
+2015-06-17 Babak Shafiei <[email protected]>
+
+ Merge r185684.
+
+ 2015-06-17 Yongjun Zhang <[email protected]>
+
+ Also turn off long press on link preview.
+ https://bugs.webkit.org/show_bug.cgi?id=146084
+
+ Also turn off long presss gesture when previewing. Turn that back on when preview is completed.
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]):
+ (-[WKContentView didDismissPreviewViewController:committing:]):
+
2015-06-16 Ryuan Choi <[email protected]>
Unreviewed build fix attempt on CMake based port after r185623.
Modified: tags/Safari-601.1.36.1/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (185688 => 185689)
--- tags/Safari-601.1.36.1/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-06-18 01:53:43 UTC (rev 185688)
+++ tags/Safari-601.1.36.1/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-06-18 01:55:35 UTC (rev 185689)
@@ -3153,6 +3153,7 @@
- (void)willPresentPreviewViewController:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
{
[self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
+ [self removeGestureRecognizer:_longPressGestureRecognizer.get()];
[self _cancelInteraction];
[[viewController presentationController] setSourceRect:_positionInformation.bounds];
@@ -3161,6 +3162,7 @@
- (void)didDismissPreviewViewController:(UIViewController *)viewController committing:(BOOL)committing
{
[self addGestureRecognizer:_touchEventGestureRecognizer.get()];
+ [self addGestureRecognizer:_longPressGestureRecognizer.get()];
id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
if ([uiDelegate respondsToSelector:@selector(_webView:didDismissPreviewViewController:)])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
