Changeset 85390 in webkit

Timestamp:

Apr 29, 2011 10:20:07 PM (13 years ago)

Author:

xan@webkit.org

Message:

2011-04-29 Xan Lopez <​xlopez@igalia.com>

Reviewed by Martin Robinson.

[Gtk+] Crash when navigating back
​https://bugs.webkit.org/show_bug.cgi?id=59799

The innerNode management in WebKitHitTestResult was relying on the
old DOM bindings behavior where every DOM objects had to be
disposed by the caller. Now the objects are garbage collected by
WebKit when either the parent frame or document dies, so this is
not needed anymore. Update the code to simply take ownership of
the node, which effectively correctly balances the reference
count.

• webkit/webkithittestresult.cpp: (webkit_hit_test_result_dispose): call C++ dtors in private data. (webkit_hit_test_result_get_property): adatp to GRefPtr API. (webkit_hit_test_result_init): call C++ ctors in private data.

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkithittestresult.cpp (modified) (5 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-04-29  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [Gtk+] Crash when navigating back
+        https://bugs.webkit.org/show_bug.cgi?id=59799
+
+        The innerNode management in WebKitHitTestResult was relying on the
+        old DOM bindings behavior where every DOM objects had to be
+        disposed by the caller. Now the objects are garbage collected by
+        WebKit when either the parent frame or document dies, so this is
+        not needed anymore. Update the code to simply take ownership of
+        the node, which effectively correctly balances the reference
+        count.
+
+        * webkit/webkithittestresult.cpp:
+        (webkit_hit_test_result_dispose): call C++ dtors in private data.
+        (webkit_hit_test_result_get_property): adatp to GRefPtr API.
+        (webkit_hit_test_result_init): call C++ ctors in private data.
+
 2011-04-28  Xan Lopez  <xlopez@igalia.com>
 

trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp

@@ -23 +23 @@
 
 #include "GOwnPtr.h"
+#include "GRefPtr.h"
 #include "HitTestResult.h"
 #include "KURL.h"
@@ -48 +49 @@
     char* imageURI;
     char* mediaURI;
-    WebKitDOMNode* innerNode;
+    GRefPtr<WebKitDOMNode> innerNode;
 };
 
@@ -75 +76 @@
 static void webkit_hit_test_result_dispose(GObject* object)
 {
-    g_object_unref(WEBKIT_HIT_TEST_RESULT(object)->priv->innerNode);
+    WEBKIT_HIT_TEST_RESULT(object)->priv->~WebKitHitTestResultPrivate();
 
     G_OBJECT_CLASS(webkit_hit_test_result_parent_class)->dispose(object);
@@ -99 +100 @@
         break;
     case PROP_INNER_NODE:
-        g_value_set_object(value, priv->innerNode);
+        g_value_set_object(value, priv->innerNode.get());
         break;
     default:
@@ -231 +232 @@
 {
     web_hit_test_result->priv = G_TYPE_INSTANCE_GET_PRIVATE(web_hit_test_result, WEBKIT_TYPE_HIT_TEST_RESULT, WebKitHitTestResultPrivate);
+    new (web_hit_test_result->priv) WebKitHitTestResultPrivate();
 }