bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-27 01:17:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 663 changes:

Browse Source 
- Mac: Delay destroying the browser window until pending drag operations have completed (issue #610).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@664 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-06-01 18:43:15 +00:00
parent 22bc38ed2c
commit da3df8bc18
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libcef/browser_webview_delegate_mac.mm
View File

@ -399,10 +399,17 @@ void BrowserWebViewDelegate::startDragging(const WebDragData& data,
ns_image = gfx::SkBitmapToNSImageWithColorSpace(bitmap, color_space); ns_image = gfx::SkBitmapToNSImageWithColorSpace(bitmap, color_space);
} }
NSPoint offset = NSPointFromCGPoint(gfx::Point(image_offset).ToCGPoint()); 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 [view startDragWithDropData:drop_data
dragOperationMask:static_cast<NSDragOperation>(mask) dragOperationMask:static_cast<NSDragOperation>(mask)
image:ns_image image:ns_image
offset:offset]; offset:offset];
[view release];
} }
void BrowserWebViewDelegate::runModal() { void BrowserWebViewDelegate::runModal() {