Title: [188152] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188152
- Author
- [email protected]
- Date
- 2015-08-07 13:14:32 -0700 (Fri, 07 Aug 2015)
Log Message
Merged r188058. <rdar://problem/22128839>
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188151 => 188152)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:13:06 UTC (rev 188151)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:14:32 UTC (rev 188152)
@@ -1,5 +1,18 @@
2015-08-07 Lucas Forschler <[email protected]>
+ Merge r188058
+
+ 2015-08-06 Enrica Casucci <[email protected]>
+
+ Build fix for iOS after http://trac.webkit.org/changeset/188053.
+
+ Unreviewed.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _registerPreview]):
+
+2015-08-07 Lucas Forschler <[email protected]>
+
Merge r188053
2015-08-06 Enrica Casucci <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188151 => 188152)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 20:13:06 UTC (rev 188151)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 20:14:32 UTC (rev 188152)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
