Changeset 187316 in webkit

Timestamp:

Jul 24, 2015, 12:54:22 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187199. rdar://problem/21945775

Location:

branches/safari-601.1-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)

branches/safari-601.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187199. rdar://problem/21945775
+
+    2015-07-22  Tim Horton  <timothy_horton@apple.com>
+
+            Fix the build
+
+            * UIProcess/ios/WKContentViewInteraction.h:
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h

@@ -122 +122 @@
     RetainPtr<WKFileUploadPanel> _fileUploadPanel;
     RetainPtr<UIGestureRecognizer> _previewGestureRecognizer;
+#if HAVE(LINK_PREVIEW)
     RetainPtr<UIPreviewItemController> _previewItemController;
+#endif
 
     std::unique_ptr<WebKit::SmartMagnificationController> _smartMagnificationController;