Title: [185448] trunk/Source/WebKit2
- Revision
- 185448
- Author
- [email protected]
- Date
- 2015-06-10 22:48:02 -0700 (Wed, 10 Jun 2015)
Log Message
Don't send touch events on link preview.
https://bugs.webkit.org/show_bug.cgi?id=145863
Disable web touch event recognizer on link preview. We do the same when finding nodes in inspector or when long press gesture
is recognized (by _cancelAllTouches).
Patch by Yongjun Zhang <[email protected]> on 2015-06-10
Reviewed by Beth Dakin.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]): Remove touch event gesture recognizer on preview start.
(-[WKContentView didDismissPreviewViewController:committing:]): Add the gesture recognizer back on dismiss.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185447 => 185448)
--- trunk/Source/WebKit2/ChangeLog 2015-06-11 04:16:24 UTC (rev 185447)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-11 05:48:02 UTC (rev 185448)
@@ -1,3 +1,17 @@
+2015-06-10 Yongjun Zhang <[email protected]>
+
+ Don't send touch events on link preview.
+ https://bugs.webkit.org/show_bug.cgi?id=145863
+
+ Disable web touch event recognizer on link preview. We do the same when finding nodes in inspector or when long press gesture
+ is recognized (by _cancelAllTouches).
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]): Remove touch event gesture recognizer on preview start.
+ (-[WKContentView didDismissPreviewViewController:committing:]): Add the gesture recognizer back on dismiss.
+
2015-06-10 Anders Carlsson <[email protected]>
WKWebsiteDataStore should handle removing plug-in data for individual records
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (185447 => 185448)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-06-11 04:16:24 UTC (rev 185447)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-06-11 05:48:02 UTC (rev 185448)
@@ -3152,12 +3152,16 @@
- (void)willPresentPreviewViewController:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
{
+ [self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
+
[self _cancelInteraction];
[[viewController presentationController] setSourceRect:_positionInformation.bounds];
}
- (void)didDismissPreviewViewController:(UIViewController *)viewController committing:(BOOL)committing
{
+ [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
+
id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
if ([uiDelegate respondsToSelector:@selector(_webView:didDismissPreviewViewController:)])
[uiDelegate _webView:_webView didDismissPreviewViewController:viewController];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
