diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-22 13:36:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-22 13:36:28 +0200 |
| commit | c311cf639cc1d6570d67b0a80a8ba04dc992a658 (patch) | |
| tree | 6e16fefc7ece11ce4ec1e475a58a537a7acebaf8 /Tools/DumpRenderTree/gtk/EventSender.cpp | |
| parent | 5ef7c8a6a70875d4430752d146bdcb069605d71d (diff) | |
| download | qtwebkit-c311cf639cc1d6570d67b0a80a8ba04dc992a658.tar.gz | |
Imported WebKit commit 35255d8c2fd37ba4359e75fe0ebe6aec87687f9c (http://svn.webkit.org/repository/webkit/trunk@126284)
New snapshot that includes MSVC 64-bit build fix
Diffstat (limited to 'Tools/DumpRenderTree/gtk/EventSender.cpp')
| -rw-r--r-- | Tools/DumpRenderTree/gtk/EventSender.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Tools/DumpRenderTree/gtk/EventSender.cpp b/Tools/DumpRenderTree/gtk/EventSender.cpp index 4cc2ab34b..d78db9370 100644 --- a/Tools/DumpRenderTree/gtk/EventSender.cpp +++ b/Tools/DumpRenderTree/gtk/EventSender.cpp @@ -157,7 +157,8 @@ static JSValueRef getMenuItemTitleCallback(JSContextRef context, JSObjectRef obj else label = gtk_menu_item_get_label(GTK_MENU_ITEM(widget)); - return JSValueMakeString(context, JSStringCreateWithUTF8CString(label.data())); + JSRetainPtr<JSStringRef> itemText(Adopt, JSStringCreateWithUTF8CString(label.data())); + return JSValueMakeString(context, itemText.get()); } static bool setMenuItemTitleCallback(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSValueRef* exception) @@ -216,10 +217,10 @@ static JSValueRef contextClickCallback(JSContextRef context, JSObjectRef functio WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame); GtkMenu* gtkMenu = webkit_web_view_get_context_menu(view); if (gtkMenu) { - GList* items = gtk_container_get_children(GTK_CONTAINER(gtkMenu)); - JSValueRef arrayValues[g_list_length(items)]; + GOwnPtr<GList> items(gtk_container_get_children(GTK_CONTAINER(gtkMenu))); + JSValueRef arrayValues[g_list_length(items.get())]; int index = 0; - for (GList* item = g_list_first(items); item; item = g_list_next(item)) { + for (GList* item = g_list_first(items.get()); item; item = g_list_next(item)) { arrayValues[index] = JSObjectMake(context, getMenuItemClass(), item->data); index++; } |