Changeset 44903 in webkit

Timestamp:

Jun 20, 2009 2:56:54 PM (15 years ago)

Author:

jmalonzo@webkit.org

Message:

2009-06-20 Jan Michael Alonzo <​jmalonzo@webkit.org>

Reviewed by Gustavo Noronha and Xan Lopez.

webkit_web_back_forward_list_add_item() should add a ref for the history item
​https://bugs.webkit.org/show_bug.cgi?id=26517

Add a ref to the WebHistoryItem when it's added to the back
forward list through webkit_web_back_forward_list_add_item.
This keeps the history item alive and prevents pywebkitgtk from
crashing

• tests/testwebbackforwardlist.c: (test_webkit_web_history_item_lifetime): (test_webkit_web_back_forward_list_order): (test_webkit_web_back_forward_list_add_item):
• webkit/webkitwebbackforwardlist.cpp: (webkit_web_back_forward_list_add_item):

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• tests/testwebbackforwardlist.c (modified) (4 diffs)
• webkit/webkitwebbackforwardlist.cpp (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-06-20  Jan Michael Alonzo  <jmalonzo@webkit.org>
+
+        Reviewed by Gustavo Noronha and Xan Lopez.
+
+        webkit_web_back_forward_list_add_item() should add a ref for the history item
+        https://bugs.webkit.org/show_bug.cgi?id=26517
+
+        Add a ref to the WebHistoryItem when it's added to the back
+        forward list through webkit_web_back_forward_list_add_item.
+        This keeps the history item alive and prevents pywebkitgtk from
+        crashing
+
+        * tests/testwebbackforwardlist.c:
+        (test_webkit_web_history_item_lifetime):
+        (test_webkit_web_back_forward_list_order):
+        (test_webkit_web_back_forward_list_add_item):
+        * webkit/webkitwebbackforwardlist.cpp:
+        (webkit_web_back_forward_list_add_item):
+
 2009-06-20  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/WebKit/gtk/tests/testwebbackforwardlist.c

@@ -48 +48 @@
     item1 = webkit_web_history_item_new_with_data("http://example.com/1/", "Site 1");
     webkit_web_back_forward_list_add_item(backForwardList, item1);
+    g_object_unref(item1);
 
     item2 = webkit_web_history_item_new_with_data("http://example.com/2/", "Site 2");
     webkit_web_back_forward_list_add_item(backForwardList, item2);
+    g_object_unref(item2);
 
     item3 = webkit_web_history_item_new_with_data("http://example.com/3/", "Site 3");
     webkit_web_back_forward_list_add_item(backForwardList, item3);
+    g_object_unref(item3);
 
     item4 = webkit_web_history_item_new_with_data("http://example.com/4/", "Site 4");
     webkit_web_back_forward_list_add_item(backForwardList, item4);
+    g_object_unref(item4);
 
     /* make sure these functions don't add unnecessary ref to the history item */
@@ -132 +136 @@
     item1 = webkit_web_history_item_new_with_data("http://example.com/1/", "Site 1");
     webkit_web_back_forward_list_add_item(webBackForwardList, item1);
+    g_object_unref(item1);
     g_assert(webkit_web_back_forward_list_contains_item(webBackForwardList, item1));
 
     item2 = webkit_web_history_item_new_with_data("http://example.com/2/", "Site 2");
     webkit_web_back_forward_list_add_item(webBackForwardList, item2);
+    g_object_unref(item2);
     g_assert(webkit_web_back_forward_list_contains_item(webBackForwardList, item2));
 
     item3 = webkit_web_history_item_new_with_data("http://example.com/3/", "Site 3");
     webkit_web_back_forward_list_add_item(webBackForwardList, item3);
+    g_object_unref(item3);
     g_assert(webkit_web_back_forward_list_contains_item(webBackForwardList, item3));
 
     item4 = webkit_web_history_item_new_with_data("http://example.com/4/", "Site 4");
     webkit_web_back_forward_list_add_item(webBackForwardList, item4);
+    g_object_unref(item4);
     g_assert(webkit_web_back_forward_list_contains_item(webBackForwardList, item4));
 
@@ -215 +223 @@
     addItem1 = webkit_web_history_item_new_with_data("http://example.com/", "Added site");
     webkit_web_back_forward_list_add_item(webBackForwardList, addItem1);
+    g_object_unref(addItem1);
     g_assert(webkit_web_back_forward_list_contains_item(webBackForwardList, addItem1));
 
@@ -230 +239 @@
     addItem2 = webkit_web_history_item_new_with_data("http://example.com/2/", "Added site 2");
     webkit_web_back_forward_list_add_item(webBackForwardList, addItem2);
+    g_object_unref(addItem2);
     g_assert(webkit_web_back_forward_list_contains_item(webBackForwardList, addItem2));
 

trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp

@@ -420 +420 @@
  * Adds the item to the #WebKitWebBackForwardList.
  *
- * The @webBackForwardList will steal the reference of the
- * @webHistoryItem, so you don't need to unref it after adding it to
- * the list.
+ * The @webBackForwardList will add a reference to the @webHistoryItem, so you
+ * don't need to keep a reference once you've added it to the list.
  *
  * Since: 1.1.1
@@ -430 +429 @@
     g_return_if_fail(WEBKIT_IS_WEB_BACK_FORWARD_LIST(webBackForwardList));
 
+    g_object_ref(webHistoryItem);
+
     WebCore::BackForwardList* backForwardList = core(webBackForwardList);
     WebCore::HistoryItem* historyItem = core(webHistoryItem);