Title: [92020] branches/safari-534.51-branch/Source/WebKit2
Diff
Modified: branches/safari-534.51-branch/Source/WebKit2/ChangeLog (92019 => 92020)
--- branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-07-29 22:14:56 UTC (rev 92019)
+++ branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-07-29 22:16:14 UTC (rev 92020)
@@ -1,5 +1,21 @@
2011-07-29 Lucas Forschler <[email protected]>
+ Merged 91271.
+
+ 2011-07-19 Brian Weinstein <[email protected]>
+
+ Add back a change that was accidentally removed in r91266.
+
+ Make sure to retain the WKPasteboardFilePromiseOwner before calling draggedImage because draggedImage releases
+ its responder. Also make the comment more explicit, to keep this mistake from being made in the future.
+
+ Rubber-stamped by Darin Adler.
+
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ (WebKit::WebDragClient::dragEnded):
+
+2011-07-29 Lucas Forschler <[email protected]>
+
Merged 91266.
2011-07-18 Brian Weinstein <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (92019 => 92020)
--- branches/safari-534.51-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2011-07-29 22:14:56 UTC (rev 92019)
+++ branches/safari-534.51-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2011-07-29 22:16:14 UTC (rev 92020)
@@ -173,6 +173,10 @@
void WebDragClient::dragEnded()
{
+ // The draggedImage method releases its responder; we must retain the WKPasteboardFilePromiseOwner an extra time to balance the release
+ // inside of the function.
+ [m_filePromiseOwner.get() retain];
+
// The drag source we care about here is NSFilePromiseDragSource, which doesn't look at
// the arguments. It's OK to just pass arbitrary constant values, so we just pass all zeroes.
[m_filePromiseOwner.get() draggedImage:nil endedAt:NSZeroPoint operation:NSDragOperationNone];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
