Changeset 195811 in webkit

Timestamp:

Jan 29, 2016 8:26:23 AM (8 years ago)

Author:

mario@webkit.org

Message:

[GTK] WebProcess crashes when quickly attempting many DnD operations
​https://bugs.webkit.org/show_bug.cgi?id=138468

Reviewed by Michael Catanzaro.

Guard all the new DnD-related code under GTK_CHECK_VERSION #if's to
make sure we don't bump the required version of GTK+ up to 3.16, and
it's buildable again with GTK+ >= 3.6.

• UIProcess/gtk/DragAndDropHandler.cpp:

(WebKit::DragAndDropHandler::DragAndDropHandler):
(WebKit::DragAndDropHandler::startDrag):
(WebKit::DragAndDropHandler::fillDragData):
(WebKit::DragAndDropHandler::finishDrag):

• UIProcess/gtk/DragAndDropHandler.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/DragAndDropHandler.cpp (modified) (6 diffs)
• UIProcess/gtk/DragAndDropHandler.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-29  Mario Sanchez Prada  <mario@endlessm.com>
+
+        [GTK] WebProcess crashes when quickly attempting many DnD operations
+        https://bugs.webkit.org/show_bug.cgi?id=138468
+
+        Reviewed by Michael Catanzaro.
+
+        Guard all the new DnD-related code under GTK_CHECK_VERSION #if's to
+        make sure we don't bump the required version of GTK+ up to 3.16, and
+        it's buildable again with GTK+ >= 3.6.
+
+        * UIProcess/gtk/DragAndDropHandler.cpp:
+        (WebKit::DragAndDropHandler::DragAndDropHandler):
+        (WebKit::DragAndDropHandler::startDrag):
+        (WebKit::DragAndDropHandler::fillDragData):
+        (WebKit::DragAndDropHandler::finishDrag):
+        * UIProcess/gtk/DragAndDropHandler.h:
+
 2016-01-28  Antti Koivisto  <antti@apple.com>
 

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

@@ -45 +45 @@
 DragAndDropHandler::DragAndDropHandler(WebPageProxy& page)
     : m_page(page)
+#if GTK_CHECK_VERSION(3, 16, 0)
     , m_dragContext(nullptr)
+#endif
 {
 }
@@ -112 +114 @@
 void DragAndDropHandler::startDrag(const DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
 {
+#if GTK_CHECK_VERSION(3, 16, 0)
     m_draggingDataObject = adoptRef(dragData.platformData());
-
     GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::singleton().targetListForDataObject(m_draggingDataObject.get()));
+#else
+    RefPtr<DataObjectGtk> dataObject = adoptRef(dragData.platformData());
+    GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::singleton().targetListForDataObject(dataObject.get()));
+#endif
+
     GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
-
     GdkDragContext* context = gtk_drag_begin(m_page.viewWidget(), targetList.get(), dragOperationToGdkDragActions(dragData.draggingSourceOperationMask()),
         GDK_BUTTON_PRIMARY, currentEvent.get());
 
+#if GTK_CHECK_VERSION(3, 16, 0)
     // WebCore::EventHandler does not support more than one DnD operation at the same time for
     // a given page, so we should cancel any previous operation whose context we might have
@@ -126 +133 @@
         gtk_drag_cancel(m_dragContext.get());
     m_dragContext = context;
+#else
+    // We don't have gtk_drag_cancel() in GTK+ < 3.16, so we use the old code.
+    // See https://bugs.webkit.org/show_bug.cgi?id=138468
+    m_draggingDataObjects.set(context, dataObject.get());
+#endif
 
     if (dragImage) {
@@ -138 +150 @@
 void DragAndDropHandler::fillDragData(GdkDragContext* context, GtkSelectionData* selectionData, unsigned info)
 {
+#if GTK_CHECK_VERSION(3, 16, 0)
     // This can happen when attempting to call finish drag from webkitWebViewBaseDragDataGet()
     // for a obsolete DnD operation that got previously cancelled in startDrag().
@@ -145 +158 @@
     ASSERT(m_draggingDataObject);
     PasteboardHelper::singleton().fillSelectionData(selectionData, info, m_draggingDataObject.get());
+#else
+    if (DataObjectGtk* dataObject = m_draggingDataObjects.get(context))
+        PasteboardHelper::singleton().fillSelectionData(selectionData, info, dataObject);
+#endif
 }
 
 void DragAndDropHandler::finishDrag(GdkDragContext* context)
 {
+#if GTK_CHECK_VERSION(3, 16, 0)
     // This can happen when attempting to call finish drag from webkitWebViewBaseDragEnd()
     // for a obsolete DnD operation that got previously cancelled in startDrag().
@@ -159 +177 @@
     m_dragContext = nullptr;
     m_draggingDataObject = nullptr;
+#else
+    if (!m_draggingDataObjects.remove(context))
+        return;
+#endif
 
     GdkDevice* device = gdk_drag_context_get_device(context);

trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h

@@ -31 +31 @@
 #include <WebCore/DataObjectGtk.h>
 #include <WebCore/IntPoint.h>
+#include <gtk/gtk.h>
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
@@ -75 +76 @@
 
     WebPageProxy& m_page;
+    HashMap<GdkDragContext*, std::unique_ptr<DroppingContext>> m_droppingContexts;
+
+#if GTK_CHECK_VERSION(3, 16, 0)
     GRefPtr<GdkDragContext> m_dragContext;
     RefPtr<WebCore::DataObjectGtk> m_draggingDataObject;
-    HashMap<GdkDragContext*, std::unique_ptr<DroppingContext>> m_droppingContexts;
+#else
+    // We don't have gtk_drag_cancel() in GTK+ < 3.16, so we use the old code.
+    // See https://bugs.webkit.org/show_bug.cgi?id=138468
+    HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk>> m_draggingDataObjects;
+#endif
 };