Title: [188154] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188154
- Author
- lforsch...@apple.com
- Date
- 2015-08-07 13:16:45 -0700 (Fri, 07 Aug 2015)
Log Message
Merged r188111. <rdar://problem/22128839>
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188153 => 188154)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:15:38 UTC (rev 188153)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:16:45 UTC (rev 188154)
@@ -1,5 +1,15 @@
2015-08-07 Lucas Forschler <lforsch...@apple.com>
+ Merge r188111
+
+ 2015-08-06 Dan Bernstein <m...@apple.com>
+
+ Fixed the non-HAVE(LINK_PREVIEW) build.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+
+2015-08-07 Lucas Forschler <lforsch...@apple.com>
+
Merge r188109
2015-08-06 Enrica Casucci <enr...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188153 => 188154)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 20:15:38 UTC (rev 188153)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 20:16:45 UTC (rev 188154)
@@ -220,8 +220,10 @@
@end
@protocol UISelectionInteractionAssistant;
+#if HAVE(LINK_PREVIEW)
@interface UIPreviewItemController (StagingToRemove)
@property (strong, nonatomic, readonly) UIGestureRecognizer *presentationSecondaryGestureRecognizer;
+#endif
@end
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
