Title: [187198] trunk/Source/WebKit2
- Revision
- 187198
- Author
- timothy_hor...@apple.com
- Date
- 2015-07-22 18:08:30 -0700 (Wed, 22 Jul 2015)
Log Message
[iOS] Adjust the preview architecture
https://bugs.webkit.org/show_bug.cgi?id=147203
<rdar://problem/21945775>
Reviewed by Simon Fraser.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _dataForPreviewItemController:atPosition:type:]):
Link previews should win over image previews if both are possible.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (187197 => 187198)
--- trunk/Source/WebKit2/ChangeLog 2015-07-23 00:57:40 UTC (rev 187197)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-23 01:08:30 UTC (rev 187198)
@@ -1,3 +1,15 @@
+2015-07-22 Tim Horton <timothy_hor...@apple.com>
+
+ [iOS] Adjust the preview architecture
+ https://bugs.webkit.org/show_bug.cgi?id=147203
+ <rdar://problem/21945775>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+ Link previews should win over image previews if both are possible.
+
2015-07-22 James Savage <james.sav...@apple.com>
Use updated CoreAnimation snapshot SPI.
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187197 => 187198)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-23 00:57:40 UTC (rev 187197)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-23 01:08:30 UTC (rev 187198)
@@ -3263,8 +3263,7 @@
dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
else
dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.url];
- }
- if (canShowImagePreview) {
+ } else if (canShowImagePreview) {
*type = UIPreviewItemTypeImage;
dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
