Title: [188155] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188155
- Author
- [email protected]
- Date
- 2015-08-07 13:17:49 -0700 (Fri, 07 Aug 2015)
Log Message
Merged r188112. <rdar://problem/22128839>
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188154 => 188155)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:16:45 UTC (rev 188154)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:17:49 UTC (rev 188155)
@@ -1,5 +1,15 @@
2015-08-07 Lucas Forschler <[email protected]>
+ Merge r188112
+
+ 2015-08-06 Dan Bernstein <[email protected]>
+
+ Fixed all the builds after trying to fix the non-HAVE(LINK_PREVIEW) build.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+
+2015-08-07 Lucas Forschler <[email protected]>
+
Merge r188111
2015-08-06 Dan Bernstein <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188154 => 188155)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 20:16:45 UTC (rev 188154)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 20:17:49 UTC (rev 188155)
@@ -223,8 +223,8 @@
#if HAVE(LINK_PREVIEW)
@interface UIPreviewItemController (StagingToRemove)
@property (strong, nonatomic, readonly) UIGestureRecognizer *presentationSecondaryGestureRecognizer;
+@end
#endif
-@end
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
