Changeset 62226 in webkit

Timestamp:

Jun 30, 2010 10:44:51 PM (14 years ago)

Author:

Martin Robinson

Message:

2010-06-30 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Convert WebKitWebView's private draggingDataObjects member to a pointer
​https://bugs.webkit.org/show_bug.cgi?id=40333

Convert draggingDataObjects to a pointer. The constructor and destructor of the
HashMap should be called explicitly. GObject memory allocation does not do this.

• WebCoreSupport/DragClientGtk.cpp: (WebKit::DragClient::startDrag):
• webkit/webkitprivate.h:
• webkit/webkitwebview.cpp: (webkit_web_view_dispose): (webkit_web_view_drag_end): (webkit_web_view_drag_data_get): (webkit_web_view_init):

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/DragClientGtk.cpp (modified) (1 diff)
• webkit/webkitprivate.h (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (4 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-06-30  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Convert WebKitWebView's private draggingDataObjects member to a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=40333
+
+        Convert draggingDataObjects to a pointer. The constructor and destructor of the
+        HashMap should be called explicitly. GObject memory allocation does not do this.
+
+        * WebCoreSupport/DragClientGtk.cpp:
+        (WebKit::DragClient::startDrag):
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_dispose):
+        (webkit_web_view_drag_end):
+        (webkit_web_view_drag_data_get):
+        (webkit_web_view_init):
+
 2010-06-30  Xan Lopez  <xlopez@igalia.com>
 

trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp

@@ -78 +78 @@
 
     GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView), targetList.get(), dragOperationToGdkDragActions(clipboard->sourceOperation()), 1, currentEvent.get());
-    webView->priv->draggingDataObjects.set(context, dataObject);
+    webView->priv->draggingDataObjects->set(context, dataObject);
 
     // A drag starting should prevent a double-click from happening. This might

trunk/WebKit/gtk/webkit/webkitprivate.h

@@ -159 +159 @@
         guint32 previousClickTime;
 
-        HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects;
+        HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> >* draggingDataObjects;
     };
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -1191 +1191 @@
     }
 
-    priv->draggingDataObjects.clear();
+    priv->draggingDataObjects->clear();
+    delete priv->draggingDataObjects;
 
     G_OBJECT_CLASS(webkit_web_view_parent_class)->dispose(object);
@@ -1310 +1311 @@
     // This might happen if a drag is still in progress after a WebKitWebView
     // is disposed and before it is finalized.
-    if (!priv->draggingDataObjects.contains(context))
+    if (!priv->draggingDataObjects->contains(context))
         return;
 
-    priv->draggingDataObjects.remove(context);
+    priv->draggingDataObjects->remove(context);
 
     Frame* frame = core(webView)->focusController()->focusedOrMainFrame();
@@ -1348 +1349 @@
     // This might happen if a drag is still in progress after a WebKitWebView
     // is diposed and before it is finalized.
-    if (!priv->draggingDataObjects.contains(context))
+    if (!priv->draggingDataObjects->contains(context))
         return;
 
-    pasteboardHelperInstance()->fillSelectionData(selectionData, info, priv->draggingDataObjects.get(context).get());
+    pasteboardHelperInstance()->fillSelectionData(selectionData, info, priv->draggingDataObjects->get(context).get());
 }
 
@@ -2929 +2930 @@
     priv->previousClickButton = 0;
     priv->previousClickTime = 0;
+
+    priv->draggingDataObjects = new HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> >();
 }