Title: [88484] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (88483 => 88484)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-09 21:18:59 UTC (rev 88483)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-09 21:19:06 UTC (rev 88484)
@@ -1,3 +1,21 @@
+2011-06-02 Lucas Forschler <[email protected]>
+
+ Merged 88401.
+
+ 2011-06-08 John Sullivan <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ <https://bugs.webkit.org/show_bug.cgi?id=62332>
+ <rdar://problem/9355199>
+ [WKView _setDragImage:at:linkDrag:] can crash if WKView is dealloc'ed during drag
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _resendKeyDownEvent:]):
+ Renamed self-protecting RetainPtr from "protect" to "protector" so it's a noun.
+ (-[WKView _setDragImage:at:linkDrag:]):
+ Added a self-protecting RetainPtr.
+
2011-06-07 Lucas Forschler <[email protected]>
Merged 88204.
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (88483 => 88484)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-06-09 21:18:59 UTC (rev 88483)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2011-06-09 21:19:06 UTC (rev 88484)
@@ -2033,7 +2033,7 @@
- (void)_resendKeyDownEvent:(NSEvent *)event
{
// resending the event may destroy this WKView
- RetainPtr<WKView> protect(self);
+ RetainPtr<WKView> protector(self);
ASSERT(!_data->_keyDownEventBeingResent);
_data->_keyDownEventBeingResent = event;
@@ -2338,6 +2338,10 @@
return;
_data->_dragHasStarted = YES;
+
+ // The call to super could release this WKView.
+ RetainPtr<WKView> protector(self);
+
[super dragImage:image
at:clientPoint
offset:NSZeroSize
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
