Changeset 185748 in webkit

Timestamp:

Jun 19, 2015, 9:05:54 AM (11 years ago)

Author:

mitz@apple.com

Message:

Fixed the build for platforms that don’t have SafariServices.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView previewViewControllerForPosition:inSourceView:]):
(-[WKContentView commitPreviewViewController:]):
(-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-19  Dan Bernstein  <mitz@apple.com>
+
+        Fixed the build for platforms that don’t have SafariServices.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView previewViewControllerForPosition:inSourceView:]):
+        (-[WKContentView commitPreviewViewController:]):
+        (-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]):
+
 2015-06-19  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -3126 +3126 @@
         return nil;
 
-    _highlightLongPressCanClick = NO;
-
     NSURL *targetURL = [NSURL URLWithString:_positionInformation.url];
     id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
-    if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:)])
+    if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:)]) {
+        _highlightLongPressCanClick = NO;
         return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL];
-
+    }
+
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
     SFSafariViewController *previewViewController = [allocSFSafariViewControllerInstance() initWithURL:targetURL];
     previewViewController._showingLinkPreview = YES;
+    _highlightLongPressCanClick = NO;
     return previewViewController;
+#else
+    return nil;
+#endif
 }
 
@@ -3146 +3151 @@
     }
 
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
     if (![viewController isKindOfClass:getSFSafariViewControllerClass()])
         return;
@@ -3157 +3163 @@
     UIViewController *presentingViewController = viewController.presentingViewController ?: self.window.rootViewController;
     [presentingViewController presentViewController:viewController animated:NO completion:nil];
+#endif
 }