Title: [188107] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188107
- Author
- bshaf...@apple.com
- Date
- 2015-08-06 19:51:36 -0700 (Thu, 06 Aug 2015)
Log Message
Roll out r188053. rdar://problem/22128839
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188106 => 188107)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 02:49:31 UTC (rev 188106)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 02:51:36 UTC (rev 188107)
@@ -1,5 +1,9 @@
2015-08-06 Babak Shafiei <bshaf...@apple.com>
+ Roll out r188053.
+
+2015-08-06 Babak Shafiei <bshaf...@apple.com>
+
Roll out r188058.
2015-08-06 Babak Shafiei <bshaf...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (188106 => 188107)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-08-07 02:49:31 UTC (rev 188106)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-08-07 02:51:36 UTC (rev 188107)
@@ -121,7 +121,6 @@
RetainPtr<WKFormInputSession> _formInputSession;
RetainPtr<WKFileUploadPanel> _fileUploadPanel;
RetainPtr<UIGestureRecognizer> _previewGestureRecognizer;
- RetainPtr<UIGestureRecognizer> _previewSecondaryGestureRecognizer;
#if HAVE(LINK_PREVIEW)
RetainPtr<UIPreviewItemController> _previewItemController;
#endif
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188106 => 188107)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 02:49:31 UTC (rev 188106)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 02:51:36 UTC (rev 188107)
@@ -416,6 +416,7 @@
[self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
[self removeGestureRecognizer:_singleTapGestureRecognizer.get()];
[self removeGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
+ [self removeGestureRecognizer:_longPressGestureRecognizer.get()];
[self removeGestureRecognizer:_doubleTapGestureRecognizer.get()];
[self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
}
@@ -425,6 +426,7 @@
[self addGestureRecognizer:_touchEventGestureRecognizer.get()];
[self addGestureRecognizer:_singleTapGestureRecognizer.get()];
[self addGestureRecognizer:_highlightLongPressGestureRecognizer.get()];
+ [self addGestureRecognizer:_longPressGestureRecognizer.get()];
[self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
[self addGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
}
@@ -874,9 +876,6 @@
if (isSamePair(gestureRecognizer, otherGestureRecognizer, _singleTapGestureRecognizer.get(), _textSelectionAssistant.get().singleTapGesture))
return YES;
- if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _previewSecondaryGestureRecognizer.get()))
- return YES;
-
if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _previewGestureRecognizer.get()))
return YES;
@@ -1077,25 +1076,21 @@
{
ASSERT(gestureRecognizer == _longPressGestureRecognizer);
+#if HAVE(LINK_PREVIEW)
+ if ([_previewItemController interactionInProgress])
+ return;
+#endif
+
_lastInteractionLocation = gestureRecognizer.startPoint;
- switch ([gestureRecognizer state]) {
- case UIGestureRecognizerStateBegan:
- {
+ if ([gestureRecognizer state] == UIGestureRecognizerStateBegan) {
SEL action = "" _actionForLongPress];
if (action) {
[self performSelector:action];
[self _cancelLongPressGestureRecognizer];
+ [UIApp _cancelAllTouches];
}
}
- break;
- case UIGestureRecognizerStateCancelled:
- case UIGestureRecognizerStateEnded:
- [_actionSheetAssistant cleanupSheet];
- break;
- default:
- break;
- }
}
- (void)_singleTapRecognized:(UITapGestureRecognizer *)gestureRecognizer
@@ -3221,14 +3216,12 @@
_previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
[_previewItemController setDelegate:self];
_previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
- _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
}
- (void)_unregisterPreview
{
[_previewItemController setDelegate:nil];
_previewGestureRecognizer = nil;
- _previewSecondaryGestureRecognizer = nil;
_previewItemController = nil;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes