Changeset 187315 in webkit

Timestamp:

Jul 24, 2015, 12:54:20 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187198. rdar://problem/21945775

Location:

branches/safari-601.1-branch/Source/WebKit2

Files:

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

branches/safari-601.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187198. rdar://problem/21945775
+
+    2015-07-22  Tim Horton  <timothy_horton@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-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -3254 +3254 @@
         else
             dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.url];
-    }
-    if (canShowImagePreview) {
+    } else if (canShowImagePreview) {
         *type = UIPreviewItemTypeImage;
         dataForPreview[UIPreviewDataLink] = [NSURL _web_URLWithWTFString:_positionInformation.imageURL];