Merge revision 663 changes:
- Mac: Delay destroying the browser window until pending drag operations have completed (issue #610). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1025@664 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
252e8f9cb6
commit
962b2a254d
|
@ -399,10 +399,17 @@ void BrowserWebViewDelegate::startDragging(const WebDragData& data,
|
|||
ns_image = gfx::SkBitmapToNSImageWithColorSpace(bitmap, color_space);
|
||||
}
|
||||
NSPoint offset = NSPointFromCGPoint(gfx::Point(image_offset).ToCGPoint());
|
||||
|
||||
// Keep a reference to the NSView so that it won't be destroyed until after
|
||||
// the drag operation has completed.
|
||||
[view retain];
|
||||
|
||||
[view startDragWithDropData:drop_data
|
||||
dragOperationMask:static_cast<NSDragOperation>(mask)
|
||||
image:ns_image
|
||||
offset:offset];
|
||||
|
||||
[view release];
|
||||
}
|
||||
|
||||
void BrowserWebViewDelegate::runModal() {
|
||||
|
|
Loading…
Reference in New Issue