Changeset 187319 in webkit

Timestamp:

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

Author:

matthew_hanson@apple.com

Message:

Merge r187212. rdar://problem/21945775

Location:

branches/safari-601.1-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

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

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187212. rdar://problem/21945775
+
+    2015-07-22  Timothy Horton  <timothy_horton@apple.com>
+
+            Fix the build
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView setupInteraction]):
+            (-[WKContentView cleanupInteraction]):
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

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

@@ -342 +342 @@
     [self addGestureRecognizer:_longPressGestureRecognizer.get()];
 
+#if HAVE(LINK_PREVIEW)
     [self _registerPreview];
+#endif
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_resetShowingTextStyle:) name:UIMenuControllerDidHideMenuNotification object:nil];
@@ -399 +401 @@
     }
 
+#if HAVE(LINK_PREVIEW)
     [self _unregisterPreview];
+#endif
+
     if (_fileUploadPanel) {
         [_fileUploadPanel setDelegate:nil];