Title: [119638] branches/safari-536-branch/Source/WebKit2
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (119637 => 119638)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-06-06 23:48:00 UTC (rev 119637)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-06-07 00:01:24 UTC (rev 119638)
@@ -1,5 +1,29 @@
2012-06-06 Mark Rowe <[email protected]>
+ Merge r119535.
+
+ 2012-06-05 Brady Eidson <[email protected]>
+
+ <rdar://problem/11575898> and https://bugs.webkit.org/show_bug.cgi?id=88372
+ REGRESSION(110494): Can no longer drag-and-drop links into FileMaker Pro 12
+
+ - Before r110494 we used to write the NSStringPboardType to the pasteboard.
+ After r110494 we write NSURLPboardType instead.
+ That's basically a no-op, but the NSStringPboardType needs to be restored.
+ - Before r110494 we wrote the link destination URL to the pasteboard.
+ After r110494 we write the image src URL if the link is an image.
+ We need to revert to writing the link URL.
+
+ Fortunately these changes can be accomplished with a 2-line fix.
+
+ Reviewed by Enrica Casucci.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setPromisedData:WebCore::withFileName:withExtension:withTitle:withURL:withVisibleURL:withArchive:WebCore::forPasteboard:]):
+ n
+
+2012-06-06 Mark Rowe <[email protected]>
+
Merge r119261.
2012-06-01 Brady Eidson <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (119637 => 119638)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-06-06 23:48:00 UTC (rev 119637)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-06-07 00:01:24 UTC (rev 119638)
@@ -2658,10 +2658,10 @@
if (!matchesExtensionOrEquivalent(filename, extension))
filename = [[filename stringByAppendingString:@"."] stringByAppendingString:extension];
- [pasteboard setString:url forType:NSURLPboardType];
+ [pasteboard setString:visibleUrl forType:NSStringPboardType];
[pasteboard setString:visibleUrl forType:PasteboardTypes::WebURLPboardType];
[pasteboard setString:title forType:PasteboardTypes::WebURLNamePboardType];
- [pasteboard setPropertyList:[NSArray arrayWithObjects:[NSArray arrayWithObject:url], [NSArray arrayWithObject:title], nil] forType:PasteboardTypes::WebURLsWithTitlesPboardType];
+ [pasteboard setPropertyList:[NSArray arrayWithObjects:[NSArray arrayWithObject:visibleUrl], [NSArray arrayWithObject:title], nil] forType:PasteboardTypes::WebURLsWithTitlesPboardType];
[pasteboard setPropertyList:[NSArray arrayWithObject:extension] forType:NSFilesPromisePboardType];
if (archiveBuffer)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
