Changeset 47493 in webkit

Timestamp:

Aug 18, 2009 10:57:17 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-18 Jan Michael Alonzo <​jmalonzo@webkit.org>

Reviewed by Oliver Hunt.

[Gtk] crash when closing page from javascript
​https://bugs.webkit.org/show_bug.cgi?id=27439

Do not unref the WebView in ChromeClientGtk::closeWindowSoon
because (1) a create-web-view handler can return a NULL WebView,
(2) the created WebView is owned by its containing widget, and (3)
clients may not handle the close-web-view signal so this avoids
unreffing a WebView more than once.

• WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::closeWindowSoon):
• webkit/webkitwebview.cpp: (webkit_web_view_class_init):

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientGtk.cpp (modified) (2 diffs)
• webkit/webkitwebview.cpp (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-08-18  Jan Michael Alonzo  <jmalonzo@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        [Gtk] crash when closing page from javascript
+        https://bugs.webkit.org/show_bug.cgi?id=27439
+
+        Do not unref the WebView in ChromeClientGtk::closeWindowSoon
+        because (1) a create-web-view handler can return a NULL WebView,
+        (2) the created WebView is owned by its containing widget, and (3)
+        clients may not handle the close-web-view signal so this avoids
+        unreffing a WebView more than once.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::closeWindowSoon):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_class_init):
+
 2009-08-18  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -216 +216 @@
 void ChromeClient::closeWindowSoon()
 {
+    // We may not have a WebView as create-web-view can return NULL.
+    if (!m_webView)
+        return;
+
     webkit_web_view_stop_loading(m_webView);
 
@@ -227 +231 @@
     // But this gets cleared in Page's destructor anyway.
     // webkit_web_view_set_group_name(m_webView, "");
-    g_object_unref(m_webView);
 }
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -1229 +1229 @@
      * until the #WebKitWebView::web-view-ready signal is emitted.
      *
-     * The signal handlers should not try to deal with the reference
-     * count for the new #WebKitWebView. The widget to which the
-     * widget is added will handle that.
+     * The signal handlers should not try to deal with the reference count for
+     * the new #WebKitWebView. The widget to which the widget is added will
+     * handle that.
      *
      * Since 1.0.3
@@ -1279 +1279 @@
      * %FALSE to propagate the event furter
      *
-     * Emitted when closing a WebView is requested. This occurs when a call
-     * is made from JavaScript's window.close function.
+     * Emitted when closing a #WebKitWebView is requested. This occurs when a
+     * call is made from JavaScript's window.close function. The default
+     * signal handler does not do anything. It is the owner's responsibility
+     * to hide or delete the web view, if necessary.
      *
      * Since 1.1.11