Title: [186527] trunk/Source/WebKit2
- Revision
- 186527
- Author
- bda...@apple.com
- Date
- 2015-07-08 14:15:01 -0700 (Wed, 08 Jul 2015)
Log Message
Only support image previews for clients that implement commitPreviewedImageWithURL
delegate
https://bugs.webkit.org/show_bug.cgi?id=146739
-and corresponding-
rdar://problem/21692929
Reviewed by Tim Horton.
We should only support image previews for clients that implement
commitPreviewedImageWithURL delegate since there is no default commit action.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView previewViewControllerForPosition:inSourceView:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186526 => 186527)
--- trunk/Source/WebKit2/ChangeLog 2015-07-08 21:11:04 UTC (rev 186526)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-08 21:15:01 UTC (rev 186527)
@@ -1,3 +1,18 @@
+2015-07-08 Beth Dakin <bda...@apple.com>
+
+ Only support image previews for clients that implement commitPreviewedImageWithURL
+ delegate
+ https://bugs.webkit.org/show_bug.cgi?id=146739
+ -and corresponding-
+ rdar://problem/21692929
+
+ Reviewed by Tim Horton.
+
+ We should only support image previews for clients that implement
+ commitPreviewedImageWithURL delegate since there is no default commit action.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView previewViewControllerForPosition:inSourceView:]):
+
2015-07-08 Anders Carlsson <ander...@apple.com>
Make ApplicationStateTracker be per view instead of being a singleton
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (186526 => 186527)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-08 21:11:04 UTC (rev 186526)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-08 21:15:01 UTC (rev 186527)
@@ -3244,6 +3244,9 @@
}
if (canShowImagePreview) {
+ if (![uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)])
+ return nil;
+
String absoluteImageURL = _positionInformation.imageURL;
if (absoluteImageURL.isEmpty() || !(WebCore::protocolIsInHTTPFamily(absoluteImageURL) || WebCore::protocolIs(absoluteImageURL, "data")))
return nil;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
