Changeset 62230 in webkit


Ignore:
Timestamp:
Jun 30, 2010 11:24:55 PM (14 years ago)
Author:
Martin Robinson
Message:

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

Unreviewed, rolling out r62226.
http://trac.webkit.org/changeset/62226
https://bugs.webkit.org/show_bug.cgi?id=40333

This change caused 13 new crashers.

  • 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/gtk/ChangeLog

    r62226 r62230  
     12010-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
    1182010-06-30  Martin Robinson  <mrobinson@igalia.com>
    219
  • trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp

    r62226 r62230  
    7878
    7979    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);
    8181
    8282    // A drag starting should prevent a double-click from happening. This might
  • trunk/WebKit/gtk/webkit/webkitprivate.h

    r62226 r62230  
    159159        guint32 previousClickTime;
    160160
    161         HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> >* draggingDataObjects;
     161        HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects;
    162162    };
    163163
  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r62226 r62230  
    11911191    }
    11921192
    1193     priv->draggingDataObjects->clear();
    1194     delete priv->draggingDataObjects;
     1193    priv->draggingDataObjects.clear();
    11951194
    11961195    G_OBJECT_CLASS(webkit_web_view_parent_class)->dispose(object);
     
    13111310    // This might happen if a drag is still in progress after a WebKitWebView
    13121311    // is disposed and before it is finalized.
    1313     if (!priv->draggingDataObjects->contains(context))
     1312    if (!priv->draggingDataObjects.contains(context))
    13141313        return;
    13151314
    1316     priv->draggingDataObjects->remove(context);
     1315    priv->draggingDataObjects.remove(context);
    13171316
    13181317    Frame* frame = core(webView)->focusController()->focusedOrMainFrame();
     
    13491348    // This might happen if a drag is still in progress after a WebKitWebView
    13501349    // is diposed and before it is finalized.
    1351     if (!priv->draggingDataObjects->contains(context))
     1350    if (!priv->draggingDataObjects.contains(context))
    13521351        return;
    13531352
    1354     pasteboardHelperInstance()->fillSelectionData(selectionData, info, priv->draggingDataObjects->get(context).get());
     1353    pasteboardHelperInstance()->fillSelectionData(selectionData, info, priv->draggingDataObjects.get(context).get());
    13551354}
    13561355
     
    29302929    priv->previousClickButton = 0;
    29312930    priv->previousClickTime = 0;
    2932 
    2933     priv->draggingDataObjects = new HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> >();
    29342931}
    29352932
Note: See TracChangeset for help on using the changeset viewer.