Changeset 59714 in webkit

Timestamp:

May 18, 2010 3:14:25 PM (14 years ago)

Author:

Martin Robinson

Message:

2010-05-18 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] DragClientGtk::startDrag leaks GdkEvents
​https://bugs.webkit.org/show_bug.cgi?id=39322

• WebCoreSupport/DragClientGtk.cpp: (WebKit::DragClient::startDrag): Properly clean up allocated GdkEvent.

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/DragClientGtk.cpp (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-05-18  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] DragClientGtk::startDrag leaks GdkEvents
+        https://bugs.webkit.org/show_bug.cgi?id=39322
+
+        * WebCoreSupport/DragClientGtk.cpp:
+        (WebKit::DragClient::startDrag): Properly clean up allocated GdkEvent.
+
 2010-05-12  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp

@@ -81 +81 @@
     GRefPtr<GtkTargetList> targetList(clipboardGtk->helper()->targetListForDataObject(dataObject.get()));
     GdkEvent* event = gdk_event_new(GDK_BUTTON_PRESS);
-    reinterpret_cast<GdkEventButton*>(event)->window = gtk_widget_get_window(GTK_WIDGET(m_webView));
-    reinterpret_cast<GdkEventButton*>(event)->time = GDK_CURRENT_TIME;
+    // This will be decremented by gdk_event_free() below.
+    event->button.window = static_cast<GdkWindow*>(g_object_ref(gtk_widget_get_window(GTK_WIDGET(m_webView))));
+    event->button.time = GDK_CURRENT_TIME;
 
     GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView), targetList.get(), dragAction, 1, event);
@@ -91 +92 @@
     else
         gtk_drag_set_icon_default(context);
+
+    gdk_event_free(event);
 }