Title: [186087] trunk/Source/WebKit2
- Revision
- 186087
- Author
- [email protected]
- Date
- 2015-06-29 14:56:29 -0700 (Mon, 29 Jun 2015)
Log Message
Disable default gesture recognizers on preview.
https://bugs.webkit.org/show_bug.cgi?id=146424
rdar://problem/21572828
We should disable default gesture recognizers on preview, to avoid activating links or
triggering touch events accidentally. We can enable them after preview finishes.
Patch by Yongjun Zhang <[email protected]> on 2015-06-29
Reviewed by Beth Dakin.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]):
(-[WKContentView didDismissPreviewViewController:committing:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186086 => 186087)
--- trunk/Source/WebKit2/ChangeLog 2015-06-29 21:38:31 UTC (rev 186086)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-29 21:56:29 UTC (rev 186087)
@@ -1,3 +1,18 @@
+2015-06-29 Yongjun Zhang <[email protected]>
+
+ Disable default gesture recognizers on preview.
+ https://bugs.webkit.org/show_bug.cgi?id=146424
+ rdar://problem/21572828
+
+ We should disable default gesture recognizers on preview, to avoid activating links or
+ triggering touch events accidentally. We can enable them after preview finishes.
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]):
+ (-[WKContentView didDismissPreviewViewController:committing:]):
+
2015-06-27 Ryosuke Niwa <[email protected]>
Font panel doesn't get updated when bolding text via cmd+b in Mail on OS X
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (186086 => 186087)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-06-29 21:38:31 UTC (rev 186086)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-06-29 21:56:29 UTC (rev 186087)
@@ -3267,8 +3267,7 @@
- (void)willPresentPreviewViewController:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
{
- [self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
- [self removeGestureRecognizer:_longPressGestureRecognizer.get()];
+ [self _removeDefaultGestureRecognizers];
[self _cancelInteraction];
[[viewController presentationController] setSourceRect:_positionInformation.bounds];
@@ -3276,8 +3275,7 @@
- (void)didDismissPreviewViewController:(UIViewController *)viewController committing:(BOOL)committing
{
- [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
- [self addGestureRecognizer:_longPressGestureRecognizer.get()];
+ [self _addDefaultGestureRecognizers];
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
