Title: [188106] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188106
- Author
- bshaf...@apple.com
- Date
- 2015-08-06 19:49:31 -0700 (Thu, 06 Aug 2015)
Log Message
Roll out r188058. rdar://problem/22128839
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188105 => 188106)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 02:08:07 UTC (rev 188105)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 02:49:31 UTC (rev 188106)
@@ -1,5 +1,9 @@
2015-08-06 Babak Shafiei <bshaf...@apple.com>
+ Roll out r188058.
+
+2015-08-06 Babak Shafiei <bshaf...@apple.com>
+
Merge r188058.
2015-08-06 Enrica Casucci <enr...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188105 => 188106)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 02:08:07 UTC (rev 188105)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 02:49:31 UTC (rev 188106)
@@ -220,10 +220,6 @@
@end
@protocol UISelectionInteractionAssistant;
-@interface UIPreviewItemController (StagingToRemove)
-@property (strong, nonatomic, readonly) UIGestureRecognizer *presentationSecondaryGestureRecognizer;
-@end
-
#endif
@interface WKFormInputSession : NSObject <_WKFormInputSession>
@@ -3225,8 +3221,7 @@
_previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
[_previewItemController setDelegate:self];
_previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
- if ([_previewItemController respondsToSelector:@selector(presentationSecondaryGestureRecognizer)])
- _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
+ _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
}
- (void)_unregisterPreview
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
