Unreviewed, rolling out r185896.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jul 2015 17:59:18 +0000 (17:59 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jul 2015 17:59:18 +0000 (17:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=146647

Caused by a refcounting error in GTK+; it's actually legal for
the event to be null, just the gi annotations were wrong.
(Requested by mcatanzaro on #webkit).

Reverted changeset:

"[GTK] Crash performing drag-and-drop"
https://bugs.webkit.org/show_bug.cgi?id=146267
http://trac.webkit.org/changeset/185896

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@186360 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp

index 2b9d564..cba5090 100644 (file)
@@ -1,3 +1,18 @@
+2015-07-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r185896.
+        https://bugs.webkit.org/show_bug.cgi?id=146647
+
+        Caused by a refcounting error in GTK+; it's actually legal for
+        the event to be null, just the gi annotations were wrong.
+        (Requested by mcatanzaro on #webkit).
+
+        Reverted changeset:
+
+        "[GTK] Crash performing drag-and-drop"
+        https://bugs.webkit.org/show_bug.cgi?id=146267
+        http://trac.webkit.org/changeset/185896
+
 2015-07-06  Anders Carlsson  <andersca@apple.com>
 
         Provide API to clear the HSTS cache
index e5467a2..ccf6f30 100644 (file)
@@ -114,9 +114,6 @@ void DragAndDropHandler::startDrag(const DragData& dragData, PassRefPtr<Shareabl
     GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::defaultPasteboardHelper()->targetListForDataObject(dataObject.get()));
     GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
 
-    if (!currentEvent)
-        return;
-
     GdkDragContext* context = gtk_drag_begin(m_page.viewWidget(), targetList.get(), dragOperationToGdkDragActions(dragData.draggingSourceOperationMask()),
         GDK_BUTTON_PRIMARY, currentEvent.get());
     m_draggingDataObjects.set(context, dataObject.get());