Changeset 62230 in webkit
- Timestamp:
- Jun 30, 2010 11:24:55 PM (14 years ago)
- Location:
- trunk/WebKit/gtk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r62226 r62230 1 2010-06-30 Martin Robinson <mrobinson@igalia.com> 2 3 Unreviewed, rolling out r62226. 4 http://trac.webkit.org/changeset/62226 5 https://bugs.webkit.org/show_bug.cgi?id=40333 6 7 This change caused 13 new crashers. 8 9 * WebCoreSupport/DragClientGtk.cpp: 10 (WebKit::DragClient::startDrag): 11 * webkit/webkitprivate.h: 12 * webkit/webkitwebview.cpp: 13 (webkit_web_view_dispose): 14 (webkit_web_view_drag_end): 15 (webkit_web_view_drag_data_get): 16 (webkit_web_view_init): 17 1 18 2010-06-30 Martin Robinson <mrobinson@igalia.com> 2 19 -
trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp
r62226 r62230 78 78 79 79 GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView), targetList.get(), dragOperationToGdkDragActions(clipboard->sourceOperation()), 1, currentEvent.get()); 80 webView->priv->draggingDataObjects ->set(context, dataObject);80 webView->priv->draggingDataObjects.set(context, dataObject); 81 81 82 82 // A drag starting should prevent a double-click from happening. This might -
trunk/WebKit/gtk/webkit/webkitprivate.h
r62226 r62230 159 159 guint32 previousClickTime; 160 160 161 HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > *draggingDataObjects;161 HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects; 162 162 }; 163 163 -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r62226 r62230 1191 1191 } 1192 1192 1193 priv->draggingDataObjects->clear(); 1194 delete priv->draggingDataObjects; 1193 priv->draggingDataObjects.clear(); 1195 1194 1196 1195 G_OBJECT_CLASS(webkit_web_view_parent_class)->dispose(object); … … 1311 1310 // This might happen if a drag is still in progress after a WebKitWebView 1312 1311 // is disposed and before it is finalized. 1313 if (!priv->draggingDataObjects ->contains(context))1312 if (!priv->draggingDataObjects.contains(context)) 1314 1313 return; 1315 1314 1316 priv->draggingDataObjects ->remove(context);1315 priv->draggingDataObjects.remove(context); 1317 1316 1318 1317 Frame* frame = core(webView)->focusController()->focusedOrMainFrame(); … … 1349 1348 // This might happen if a drag is still in progress after a WebKitWebView 1350 1349 // is diposed and before it is finalized. 1351 if (!priv->draggingDataObjects ->contains(context))1350 if (!priv->draggingDataObjects.contains(context)) 1352 1351 return; 1353 1352 1354 pasteboardHelperInstance()->fillSelectionData(selectionData, info, priv->draggingDataObjects ->get(context).get());1353 pasteboardHelperInstance()->fillSelectionData(selectionData, info, priv->draggingDataObjects.get(context).get()); 1355 1354 } 1356 1355 … … 2930 2929 priv->previousClickButton = 0; 2931 2930 priv->previousClickTime = 0; 2932 2933 priv->draggingDataObjects = new HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> >();2934 2931 } 2935 2932
Note: See TracChangeset
for help on using the changeset viewer.