Changeset 41158 in webkit

Timestamp:

Feb 23, 2009 3:20:33 PM (15 years ago)

Author:

treat@webkit.org

Message:

2009-02-23 Adam Treat <​adam.treat@torchmobile.com>

Reviewed by Timothy Hatcher.

​https://bugs.webkit.org/show_bug.cgi?id=24106
The Qt port is crashing on exit because the tear down procedure involves
the WebCore::InspectorController trying to access the JS execution context
for a page that is being deleted. This patch amends the inspector so
that it does not try and access the execution context of the WebCore::Page
in the midst of deletion.

• inspector/InspectorController.cpp: (WebCore::InspectorController::inspectedPageDestroyed): (WebCore::InspectorController::stopUserInitiatedProfiling):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-02-23  Adam Treat  <adam.treat@torchmobile.com>
+
+        Reviewed by Timothy Hatcher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24106
+        The Qt port is crashing on exit because the tear down procedure involves
+        the WebCore::InspectorController trying to access the JS execution context
+        for a page that is being deleted.  This patch amends the inspector so
+        that it does not try and access the execution context of the WebCore::Page
+        in the midst of deletion.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::inspectedPageDestroyed):
+        (WebCore::InspectorController::stopUserInitiatedProfiling):
+
 2009-02-23  David Levin  <levin@chromium.org>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -1221 +1221 @@
 void InspectorController::inspectedPageDestroyed()
 {
-    close();
-
     ASSERT(m_inspectedPage);
     m_inspectedPage = 0;
+
+    close();
 }
 
@@ -1826 +1826 @@
     title += UString::from(m_currentUserInitiatedProfileNumber);
 
-    ExecState* exec = toJSDOMWindow(m_inspectedPage->mainFrame())->globalExec();
-    RefPtr<Profile> profile = Profiler::profiler()->stopProfiling(exec, title);
-    if (profile)
-        addProfile(profile, 0, UString());
+    if (m_inspectedPage) {
+        ExecState* exec = toJSDOMWindow(m_inspectedPage->mainFrame())->globalExec();
+        RefPtr<Profile> profile = Profiler::profiler()->stopProfiling(exec, title);
+        if (profile)
+            addProfile(profile, 0, UString());
+    }
 
     toggleRecordButton(false);