Changeset 126267 in webkit


Ignore:
Timestamp:
Aug 21, 2012 11:47:38 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] contextClick and getMenuItemTitle callbacks are leaky in DRT's EventSender
https://bugs.webkit.org/show_bug.cgi?id=94669

Patch by Sudarsana Nagineni <sudarsana.nagineni@linux.intel.com> on 2012-08-21
Reviewed by Carlos Garcia Campos.

Fix memory leaks in DRT's EventSender code.

  • DumpRenderTree/gtk/EventSender.cpp:

(getMenuItemTitleCallback): Use JSRetainPtr and don't leak.
(contextClickCallback): Use GOwnPtr to manage memory of a
newly-allocated list automatically.

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r126247 r126267  
     12012-08-21  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
     2
     3        [GTK] contextClick and getMenuItemTitle callbacks are leaky in DRT's EventSender
     4        https://bugs.webkit.org/show_bug.cgi?id=94669
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Fix memory leaks in DRT's EventSender code.
     9
     10        * DumpRenderTree/gtk/EventSender.cpp:
     11        (getMenuItemTitleCallback): Use JSRetainPtr and don't leak.
     12        (contextClickCallback): Use GOwnPtr to manage memory of a
     13        newly-allocated list automatically.
     14
    1152012-08-21  Dirk Pranke  <dpranke@chromium.org>
    216
  • trunk/Tools/DumpRenderTree/gtk/EventSender.cpp

    r122159 r126267  
    158158        label = gtk_menu_item_get_label(GTK_MENU_ITEM(widget));
    159159
    160     return JSValueMakeString(context, JSStringCreateWithUTF8CString(label.data()));
     160    JSRetainPtr<JSStringRef> itemText(Adopt, JSStringCreateWithUTF8CString(label.data()));
     161    return JSValueMakeString(context, itemText.get());
    161162}
    162163
     
    217218    GtkMenu* gtkMenu = webkit_web_view_get_context_menu(view);
    218219    if (gtkMenu) {
    219         GList* items = gtk_container_get_children(GTK_CONTAINER(gtkMenu));
    220         JSValueRef arrayValues[g_list_length(items)];
     220        GOwnPtr<GList> items(gtk_container_get_children(GTK_CONTAINER(gtkMenu)));
     221        JSValueRef arrayValues[g_list_length(items.get())];
    221222        int index = 0;
    222         for (GList* item = g_list_first(items); item; item = g_list_next(item)) {
     223        for (GList* item = g_list_first(items.get()); item; item = g_list_next(item)) {
    223224            arrayValues[index] = JSObjectMake(context, getMenuItemClass(), item->data);
    224225            index++;
Note: See TracChangeset for help on using the changeset viewer.