Title: [185748] trunk/Source/WebKit2
- Revision
- 185748
- Author
- [email protected]
- Date
- 2015-06-19 09:05:54 -0700 (Fri, 19 Jun 2015)
Log Message
Fixed the build for platforms that don’t have SafariServices.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView previewViewControllerForPosition:inSourceView:]):
(-[WKContentView commitPreviewViewController:]):
(-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185747 => 185748)
--- trunk/Source/WebKit2/ChangeLog 2015-06-19 13:31:52 UTC (rev 185747)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-19 16:05:54 UTC (rev 185748)
@@ -1,3 +1,12 @@
+2015-06-19 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
Remove unnecessary svn:executable flags
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (185747 => 185748)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-06-19 13:31:52 UTC (rev 185747)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-06-19 16:05:54 UTC (rev 185748)
@@ -3125,16 +3125,21 @@
if (absoluteLinkURL.isEmpty() || !WebCore::protocolIsInHTTPFamily(absoluteLinkURL))
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
}
- (void)commitPreviewViewController:(UIViewController *)viewController
@@ -3145,6 +3150,7 @@
return;
}
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
if (![viewController isKindOfClass:getSFSafariViewControllerClass()])
return;
@@ -3156,6 +3162,7 @@
UIViewController *presentingViewController = viewController.presentingViewController ?: self.window.rootViewController;
[presentingViewController presentViewController:viewController animated:NO completion:nil];
+#endif
}
- (void)willPresentPreviewViewController:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
