Title: [187316] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187316
- Author
- [email protected]
- Date
- 2015-07-24 00:54:22 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187199. rdar://problem/21945775
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187315 => 187316)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:20 UTC (rev 187315)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:22 UTC (rev 187316)
@@ -1,5 +1,15 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187199. rdar://problem/21945775
+
+ 2015-07-22 Tim Horton <[email protected]>
+
+ Fix the build
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+
+2015-07-24 Matthew Hanson <[email protected]>
+
Merge r187198. rdar://problem/21945775
2015-07-22 Tim Horton <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (187315 => 187316)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-07-24 07:54:20 UTC (rev 187315)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-07-24 07:54:22 UTC (rev 187316)
@@ -121,7 +121,9 @@
RetainPtr<WKFormInputSession> _formInputSession;
RetainPtr<WKFileUploadPanel> _fileUploadPanel;
RetainPtr<UIGestureRecognizer> _previewGestureRecognizer;
+#if HAVE(LINK_PREVIEW)
RetainPtr<UIPreviewItemController> _previewItemController;
+#endif
std::unique_ptr<WebKit::SmartMagnificationController> _smartMagnificationController;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
