bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1070 changes: 

- Linux: Fix drag/drop crash in WebCore::DragData::modifierKeyState (issue #875).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1271@1072 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-02-01 17:44:56 +00:00
parent c224c1aca4
commit def60d4ad0
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cef1/libcef/web_drop_target_gtk.cc
View File

@ -83,6 +83,7 @@ WebDropTarget::WebDropTarget(CefBrowserImpl* browser)
: browser_(browser), : browser_(browser),
data_requests_(0), data_requests_(0),
context_(NULL), context_(NULL),
sent_drag_enter_(false),
method_factory_(this) { method_factory_(this) {
GtkWidget* widget = browser->UIT_GetWebViewHost()->view_handle(); GtkWidget* widget = browser->UIT_GetWebViewHost()->view_handle();
gtk_drag_dest_set(widget, (GtkDestDefaults)0, NULL, 0, gtk_drag_dest_set(widget, (GtkDestDefaults)0, NULL, 0,
@ -148,6 +149,10 @@ void WebDropTarget::OnDragLeave(GtkWidget* widget, GdkDragContext* context,
context_ = NULL; context_ = NULL;
drop_data_.reset(); drop_data_.reset();
// Don't send the drag leave if we didn't send the drag enter.
if (!sent_drag_enter_)
return;
// Sometimes we get a drag-leave event before getting a drag-data-received // Sometimes we get a drag-leave event before getting a drag-data-received
// event. In that case, we don't want to bother the renderer with a // event. In that case, we don't want to bother the renderer with a
// DragLeave event. // DragLeave event.
@ -258,6 +263,7 @@ void WebDropTarget::OnDragDataReceived(GtkWidget* widget,
if (handler->OnDragEnter(browser_, data, if (handler->OnDragEnter(browser_, data,
(cef_drag_operations_mask_t)_mask(context))) { (cef_drag_operations_mask_t)_mask(context))) {
operation = WebDragOperationNone; operation = WebDragOperationNone;
sent_drag_enter_ = false;
gdk_drag_status(context, gdk_drag_status(context,
(GdkDragAction)DragDropTypes::DragOperationToGdkDragAction( (GdkDragAction)DragDropTypes::DragOperationToGdkDragAction(
operation), operation),
@ -270,6 +276,7 @@ void WebDropTarget::OnDragDataReceived(GtkWidget* widget,
gtk_widget_translate_coordinates(gtk_widget_get_toplevel(widget), widget, gtk_widget_translate_coordinates(gtk_widget_get_toplevel(widget), widget,
x, y, &widget_x, &widget_y); x, y, &widget_x, &widget_y);
WebView* webview = getView(); WebView* webview = getView();
sent_drag_enter_ = true;
operation = webview->dragTargetDragEnter(drop_data_->ToDragData(), operation = webview->dragTargetDragEnter(drop_data_->ToDragData(),
WebPoint(x, y), WebPoint(x, y),
WebPoint(widget_x, widget_y), WebPoint(widget_x, widget_y),

1
cef1/libcef/web_drop_target_gtk.h
View File

@ -45,6 +45,7 @@ class WebDropTarget : public base::RefCounted<WebDropTarget> {
bool entered_; bool entered_;
int data_requests_; int data_requests_;
GdkDragContext* context_; GdkDragContext* context_;
bool sent_drag_enter_;
base::WeakPtrFactory<WebDropTarget> method_factory_; base::WeakPtrFactory<WebDropTarget> method_factory_;
}; };