Title: [119535] trunk/Source/WebKit2
- Revision
- 119535
- Author
- [email protected]
- Date
- 2012-06-05 17:15:42 -0700 (Tue, 05 Jun 2012)
Log Message
<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
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (119534 => 119535)
--- trunk/Source/WebKit2/ChangeLog 2012-06-06 00:05:46 UTC (rev 119534)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-06 00:15:42 UTC (rev 119535)
@@ -1,3 +1,23 @@
+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-05 Tor Arne Vestbø <[email protected]>
[Qt] Implement log channel initialization for WebKit2
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (119534 => 119535)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-06-06 00:05:46 UTC (rev 119534)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-06-06 00:15:42 UTC (rev 119535)
@@ -2660,10 +2660,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
