Title: [188060] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188060
- Author
- bshaf...@apple.com
- Date
- 2015-08-06 14:23:10 -0700 (Thu, 06 Aug 2015)
Log Message
Merged r188058. rdar://problem/22128839
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188059 => 188060)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-06 21:17:03 UTC (rev 188059)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-06 21:23:10 UTC (rev 188060)
@@ -1,5 +1,18 @@
2015-08-06 Babak Shafiei <bshaf...@apple.com>
+ Merge r188058.
+
+ 2015-08-06 Enrica Casucci <enr...@apple.com>
+
+ Build fix for iOS after http://trac.webkit.org/changeset/188053.
+
+ Unreviewed.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _registerPreview]):
+
+2015-08-06 Babak Shafiei <bshaf...@apple.com>
+
Merge r188053.
2015-08-06 Enrica Casucci <enr...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188059 => 188060)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-06 21:17:03 UTC (rev 188059)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-06 21:23:10 UTC (rev 188060)
@@ -220,6 +220,10 @@
@end
@protocol UISelectionInteractionAssistant;
+@interface UIPreviewItemController (StagingToRemove)
+@property (strong, nonatomic, readonly) UIGestureRecognizer *presentationSecondaryGestureRecognizer;
+@end
+
#endif
@interface WKFormInputSession : NSObject <_WKFormInputSession>
@@ -3221,7 +3225,8 @@
_previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
[_previewItemController setDelegate:self];
_previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
- _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
+ if ([_previewItemController respondsToSelector:@selector(presentationSecondaryGestureRecognizer)])
+ _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
}
- (void)_unregisterPreview
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes