Title: [187315] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187315
- Author
- [email protected]
- Date
- 2015-07-24 00:54:20 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187198. rdar://problem/21945775
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187314 => 187315)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:18 UTC (rev 187314)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:20 UTC (rev 187315)
@@ -1,5 +1,21 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187198. rdar://problem/21945775
+
+ 2015-07-22 Tim Horton <[email protected]>
+
+ [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-24 Matthew Hanson <[email protected]>
+
Merge r187193. rdar://problem/21945775
2015-07-22 Tim Horton <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187314 => 187315)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-24 07:54:18 UTC (rev 187314)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-24 07:54:20 UTC (rev 187315)
@@ -3253,8 +3253,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
