Title: [186453] releases/WebKitGTK/webkit-2.8/Source/WebKit2
Revision
186453
Author
[email protected]
Date
2015-07-07 05:25:05 -0700 (Tue, 07 Jul 2015)

Log Message

Merge r186360 - 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

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (186452 => 186453)


--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog	2015-07-07 12:18:16 UTC (rev 186452)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog	2015-07-07 12:25:05 UTC (rev 186453)
@@ -1,3 +1,18 @@
+2015-07-06  Commit Queue  <[email protected]>
+
+        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-05  Timothy Hatcher  <[email protected]>
 
         Crash when closing the web inspector

Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (186452 => 186453)


--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp	2015-07-07 12:18:16 UTC (rev 186452)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp	2015-07-07 12:25:05 UTC (rev 186453)
@@ -114,9 +114,6 @@
     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());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to