Changeset 27839 in webkit

Timestamp:

Nov 15, 2007 10:15:18 PM (16 years ago)

Author:

timothy@apple.com

Message:

Reviewed by Mark Rowe.

Bug 14761: Web Inspector leaks JS objects and DOM nodes
​http://bugs.webkit.org/show_bug.cgi?id=14761

• page/InspectorController.cpp: (WebCore::InspectorController::~InspectorController): Change the tear down order so that inspectorDestroyed() is called before InspectorController private data is set to Zero. The inspectorDestroyed() call ends up closing the WebView and triggering InspectorController::close() which unprotects m_scriptObject. This didn't happen when the private data was cleared before calling inspectorDestroyed().

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/InspectorController.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-15  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Bug 14761: Web Inspector leaks JS objects and DOM nodes
+        http://bugs.webkit.org/show_bug.cgi?id=14761
+
+        * page/InspectorController.cpp:
+        (WebCore::InspectorController::~InspectorController):
+        Change the tear down order so that inspectorDestroyed() is called before
+        InspectorController private data is set to Zero. The inspectorDestroyed()
+        call ends up closing the WebView and triggering InspectorController::close()
+        which unprotects m_scriptObject. This didn't happen when the private data
+        was cleared before calling inspectorDestroyed().
+
 2007-11-15  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/page/InspectorController.cpp

@@ -562 +562 @@
 InspectorController::~InspectorController()
 {
+    m_client->inspectorDestroyed();
+
     if (m_scriptContext) {
         JSObjectRef global = JSContextGetGlobalObject(m_scriptContext);
@@ -569 +571 @@
         JSObjectSetPrivate(controller, 0);
     }
-
-    m_client->closeWindow();
-    m_client->inspectorDestroyed();
 
     if (m_page)